Refactor code structure for improved readability and maintainability
Test Suite / test (24.15.0) (push) Has been cancelled
Test Suite / test (24.15.0) (push) Has been cancelled
This commit is contained in:
Nils-Johan Gynther
+632
@@ -0,0 +1,632 @@
|
||||
import { Prisma } from '@prisma/client';
|
||||
import { PrismaService } from '../prisma/prisma.service';
|
||||
import { AiService } from '../ai/ai.service';
|
||||
import { CreateRecipeDto } from './dto/create-recipe.dto';
|
||||
import { CreateIngredientDto } from './dto/create-ingredient.dto';
|
||||
import { ParseMarkdownDto } from './dto/parse-markdown.dto';
|
||||
export interface AiRecipeSuggestion {
|
||||
name: string;
|
||||
description: string;
|
||||
mainIngredients: string[];
|
||||
missingIngredients: string[];
|
||||
estimatedTime: string;
|
||||
}
|
||||
export declare class RecipesService {
|
||||
private readonly prisma;
|
||||
private readonly aiService;
|
||||
private readonly logger;
|
||||
constructor(prisma: PrismaService, aiService: AiService);
|
||||
private throwRecipeNotFound;
|
||||
private assertProductsActive;
|
||||
private findRecipeByIdOrThrow;
|
||||
private assertAndClaimRecipeOwner;
|
||||
private assertRecipeOwnedByUser;
|
||||
getInventoryPreview(id: number, userId: number): Promise<{
|
||||
recipe: {
|
||||
id: number;
|
||||
name: string;
|
||||
description: string | null;
|
||||
};
|
||||
ingredients: {
|
||||
ingredientId: any;
|
||||
productId: any;
|
||||
productName: any;
|
||||
requiredQuantity: number;
|
||||
requiredUnit: any;
|
||||
note: any;
|
||||
availableQuantity: number;
|
||||
availableUnit: any;
|
||||
matchingInventoryItems: {
|
||||
id: any;
|
||||
quantity: any;
|
||||
unit: any;
|
||||
location: any;
|
||||
brand: any;
|
||||
bestBeforeDate: any;
|
||||
}[];
|
||||
otherInventoryItems: {
|
||||
id: any;
|
||||
quantity: any;
|
||||
unit: any;
|
||||
location: any;
|
||||
convertedQuantity: number;
|
||||
canConvert: boolean;
|
||||
}[];
|
||||
status: "missing" | "enough" | "unit_mismatch";
|
||||
fromPantry: boolean;
|
||||
missingQuantity: number;
|
||||
}[];
|
||||
summary: {
|
||||
totalIngredients: number;
|
||||
enoughCount: number;
|
||||
missingCount: number;
|
||||
unitMismatchCount: number;
|
||||
canCookExactly: boolean;
|
||||
pantryCount: number;
|
||||
};
|
||||
}>;
|
||||
findAll(userId: number): Promise<({
|
||||
owner: {
|
||||
id: number;
|
||||
username: string;
|
||||
} | null;
|
||||
ingredients: ({
|
||||
product: ({
|
||||
nutrition: {
|
||||
calories: number | null;
|
||||
protein: number | null;
|
||||
fat: number | null;
|
||||
carbohydrates: number | null;
|
||||
salt: number | null;
|
||||
sugar: number | null;
|
||||
fiber: number | null;
|
||||
id: number;
|
||||
productId: number;
|
||||
} | null;
|
||||
} & {
|
||||
category: string | null;
|
||||
status: string;
|
||||
name: string;
|
||||
categoryId: number | null;
|
||||
canonicalName: string | null;
|
||||
id: number;
|
||||
normalizedName: string;
|
||||
isActive: boolean;
|
||||
deletedAt: Date | null;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number;
|
||||
isPrivate: boolean;
|
||||
}) | null;
|
||||
} & {
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
productId: number | null;
|
||||
quantity: Prisma.Decimal | null;
|
||||
unit: string | null;
|
||||
rawName: string;
|
||||
rawLine: string | null;
|
||||
note: string | null;
|
||||
matchConfidence: number | null;
|
||||
matchSource: string | null;
|
||||
alternativeProductIds: Prisma.JsonValue | null;
|
||||
recipeId: number;
|
||||
analysisStatus: string | null;
|
||||
})[];
|
||||
shares: {
|
||||
userId: number;
|
||||
}[];
|
||||
} & {
|
||||
isPublic: boolean;
|
||||
name: string;
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number | null;
|
||||
description: string | null;
|
||||
instructions: string | null;
|
||||
imageUrl: string | null;
|
||||
servings: number | null;
|
||||
})[]>;
|
||||
findOne(id: number, userId: number): Promise<{
|
||||
owner: {
|
||||
id: number;
|
||||
username: string;
|
||||
} | null;
|
||||
ingredients: ({
|
||||
product: ({
|
||||
nutrition: {
|
||||
calories: number | null;
|
||||
protein: number | null;
|
||||
fat: number | null;
|
||||
carbohydrates: number | null;
|
||||
salt: number | null;
|
||||
sugar: number | null;
|
||||
fiber: number | null;
|
||||
id: number;
|
||||
productId: number;
|
||||
} | null;
|
||||
} & {
|
||||
category: string | null;
|
||||
status: string;
|
||||
name: string;
|
||||
categoryId: number | null;
|
||||
canonicalName: string | null;
|
||||
id: number;
|
||||
normalizedName: string;
|
||||
isActive: boolean;
|
||||
deletedAt: Date | null;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number;
|
||||
isPrivate: boolean;
|
||||
}) | null;
|
||||
} & {
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
productId: number | null;
|
||||
quantity: Prisma.Decimal | null;
|
||||
unit: string | null;
|
||||
rawName: string;
|
||||
rawLine: string | null;
|
||||
note: string | null;
|
||||
matchConfidence: number | null;
|
||||
matchSource: string | null;
|
||||
alternativeProductIds: Prisma.JsonValue | null;
|
||||
recipeId: number;
|
||||
analysisStatus: string | null;
|
||||
})[];
|
||||
shares: {
|
||||
userId: number;
|
||||
}[];
|
||||
} & {
|
||||
isPublic: boolean;
|
||||
name: string;
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number | null;
|
||||
description: string | null;
|
||||
instructions: string | null;
|
||||
imageUrl: string | null;
|
||||
servings: number | null;
|
||||
}>;
|
||||
update(id: number, updateRecipeDto: CreateRecipeDto, userId: number): Promise<{
|
||||
ingredients: ({
|
||||
product: ({
|
||||
nutrition: {
|
||||
calories: number | null;
|
||||
protein: number | null;
|
||||
fat: number | null;
|
||||
carbohydrates: number | null;
|
||||
salt: number | null;
|
||||
sugar: number | null;
|
||||
fiber: number | null;
|
||||
id: number;
|
||||
productId: number;
|
||||
} | null;
|
||||
} & {
|
||||
category: string | null;
|
||||
status: string;
|
||||
name: string;
|
||||
categoryId: number | null;
|
||||
canonicalName: string | null;
|
||||
id: number;
|
||||
normalizedName: string;
|
||||
isActive: boolean;
|
||||
deletedAt: Date | null;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number;
|
||||
isPrivate: boolean;
|
||||
}) | null;
|
||||
} & {
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
productId: number | null;
|
||||
quantity: Prisma.Decimal | null;
|
||||
unit: string | null;
|
||||
rawName: string;
|
||||
rawLine: string | null;
|
||||
note: string | null;
|
||||
matchConfidence: number | null;
|
||||
matchSource: string | null;
|
||||
alternativeProductIds: Prisma.JsonValue | null;
|
||||
recipeId: number;
|
||||
analysisStatus: string | null;
|
||||
})[];
|
||||
} & {
|
||||
isPublic: boolean;
|
||||
name: string;
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number | null;
|
||||
description: string | null;
|
||||
instructions: string | null;
|
||||
imageUrl: string | null;
|
||||
servings: number | null;
|
||||
}>;
|
||||
remove(id: number, userId: number): Promise<void>;
|
||||
updateImage(id: number, sourceUrl: string, userId: number): Promise<{
|
||||
owner: {
|
||||
id: number;
|
||||
username: string;
|
||||
} | null;
|
||||
ingredients: ({
|
||||
product: ({
|
||||
nutrition: {
|
||||
calories: number | null;
|
||||
protein: number | null;
|
||||
fat: number | null;
|
||||
carbohydrates: number | null;
|
||||
salt: number | null;
|
||||
sugar: number | null;
|
||||
fiber: number | null;
|
||||
id: number;
|
||||
productId: number;
|
||||
} | null;
|
||||
} & {
|
||||
category: string | null;
|
||||
status: string;
|
||||
name: string;
|
||||
categoryId: number | null;
|
||||
canonicalName: string | null;
|
||||
id: number;
|
||||
normalizedName: string;
|
||||
isActive: boolean;
|
||||
deletedAt: Date | null;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number;
|
||||
isPrivate: boolean;
|
||||
}) | null;
|
||||
} & {
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
productId: number | null;
|
||||
quantity: Prisma.Decimal | null;
|
||||
unit: string | null;
|
||||
rawName: string;
|
||||
rawLine: string | null;
|
||||
note: string | null;
|
||||
matchConfidence: number | null;
|
||||
matchSource: string | null;
|
||||
alternativeProductIds: Prisma.JsonValue | null;
|
||||
recipeId: number;
|
||||
analysisStatus: string | null;
|
||||
})[];
|
||||
shares: {
|
||||
userId: number;
|
||||
}[];
|
||||
} & {
|
||||
isPublic: boolean;
|
||||
name: string;
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number | null;
|
||||
description: string | null;
|
||||
instructions: string | null;
|
||||
imageUrl: string | null;
|
||||
servings: number | null;
|
||||
}>;
|
||||
setVisibility(id: number, userId: number, isPublic: boolean): Promise<{
|
||||
owner: {
|
||||
id: number;
|
||||
username: string;
|
||||
} | null;
|
||||
ingredients: ({
|
||||
product: ({
|
||||
nutrition: {
|
||||
calories: number | null;
|
||||
protein: number | null;
|
||||
fat: number | null;
|
||||
carbohydrates: number | null;
|
||||
salt: number | null;
|
||||
sugar: number | null;
|
||||
fiber: number | null;
|
||||
id: number;
|
||||
productId: number;
|
||||
} | null;
|
||||
} & {
|
||||
category: string | null;
|
||||
status: string;
|
||||
name: string;
|
||||
categoryId: number | null;
|
||||
canonicalName: string | null;
|
||||
id: number;
|
||||
normalizedName: string;
|
||||
isActive: boolean;
|
||||
deletedAt: Date | null;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number;
|
||||
isPrivate: boolean;
|
||||
}) | null;
|
||||
} & {
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
productId: number | null;
|
||||
quantity: Prisma.Decimal | null;
|
||||
unit: string | null;
|
||||
rawName: string;
|
||||
rawLine: string | null;
|
||||
note: string | null;
|
||||
matchConfidence: number | null;
|
||||
matchSource: string | null;
|
||||
alternativeProductIds: Prisma.JsonValue | null;
|
||||
recipeId: number;
|
||||
analysisStatus: string | null;
|
||||
})[];
|
||||
shares: {
|
||||
userId: number;
|
||||
}[];
|
||||
} & {
|
||||
isPublic: boolean;
|
||||
name: string;
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number | null;
|
||||
description: string | null;
|
||||
instructions: string | null;
|
||||
imageUrl: string | null;
|
||||
servings: number | null;
|
||||
}>;
|
||||
shareWithUser(id: number, ownerId: number, username: string): Promise<{
|
||||
owner: {
|
||||
id: number;
|
||||
username: string;
|
||||
} | null;
|
||||
ingredients: ({
|
||||
product: ({
|
||||
nutrition: {
|
||||
calories: number | null;
|
||||
protein: number | null;
|
||||
fat: number | null;
|
||||
carbohydrates: number | null;
|
||||
salt: number | null;
|
||||
sugar: number | null;
|
||||
fiber: number | null;
|
||||
id: number;
|
||||
productId: number;
|
||||
} | null;
|
||||
} & {
|
||||
category: string | null;
|
||||
status: string;
|
||||
name: string;
|
||||
categoryId: number | null;
|
||||
canonicalName: string | null;
|
||||
id: number;
|
||||
normalizedName: string;
|
||||
isActive: boolean;
|
||||
deletedAt: Date | null;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number;
|
||||
isPrivate: boolean;
|
||||
}) | null;
|
||||
} & {
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
productId: number | null;
|
||||
quantity: Prisma.Decimal | null;
|
||||
unit: string | null;
|
||||
rawName: string;
|
||||
rawLine: string | null;
|
||||
note: string | null;
|
||||
matchConfidence: number | null;
|
||||
matchSource: string | null;
|
||||
alternativeProductIds: Prisma.JsonValue | null;
|
||||
recipeId: number;
|
||||
analysisStatus: string | null;
|
||||
})[];
|
||||
shares: {
|
||||
userId: number;
|
||||
}[];
|
||||
} & {
|
||||
isPublic: boolean;
|
||||
name: string;
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number | null;
|
||||
description: string | null;
|
||||
instructions: string | null;
|
||||
imageUrl: string | null;
|
||||
servings: number | null;
|
||||
}>;
|
||||
unshareWithUser(id: number, ownerId: number, username: string): Promise<{
|
||||
owner: {
|
||||
id: number;
|
||||
username: string;
|
||||
} | null;
|
||||
ingredients: ({
|
||||
product: ({
|
||||
nutrition: {
|
||||
calories: number | null;
|
||||
protein: number | null;
|
||||
fat: number | null;
|
||||
carbohydrates: number | null;
|
||||
salt: number | null;
|
||||
sugar: number | null;
|
||||
fiber: number | null;
|
||||
id: number;
|
||||
productId: number;
|
||||
} | null;
|
||||
} & {
|
||||
category: string | null;
|
||||
status: string;
|
||||
name: string;
|
||||
categoryId: number | null;
|
||||
canonicalName: string | null;
|
||||
id: number;
|
||||
normalizedName: string;
|
||||
isActive: boolean;
|
||||
deletedAt: Date | null;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number;
|
||||
isPrivate: boolean;
|
||||
}) | null;
|
||||
} & {
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
productId: number | null;
|
||||
quantity: Prisma.Decimal | null;
|
||||
unit: string | null;
|
||||
rawName: string;
|
||||
rawLine: string | null;
|
||||
note: string | null;
|
||||
matchConfidence: number | null;
|
||||
matchSource: string | null;
|
||||
alternativeProductIds: Prisma.JsonValue | null;
|
||||
recipeId: number;
|
||||
analysisStatus: string | null;
|
||||
})[];
|
||||
shares: {
|
||||
userId: number;
|
||||
}[];
|
||||
} & {
|
||||
isPublic: boolean;
|
||||
name: string;
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number | null;
|
||||
description: string | null;
|
||||
instructions: string | null;
|
||||
imageUrl: string | null;
|
||||
servings: number | null;
|
||||
}>;
|
||||
create(createRecipeDto: CreateRecipeDto, userId: number): Promise<{
|
||||
ingredients: ({
|
||||
product: ({
|
||||
nutrition: {
|
||||
calories: number | null;
|
||||
protein: number | null;
|
||||
fat: number | null;
|
||||
carbohydrates: number | null;
|
||||
salt: number | null;
|
||||
sugar: number | null;
|
||||
fiber: number | null;
|
||||
id: number;
|
||||
productId: number;
|
||||
} | null;
|
||||
} & {
|
||||
category: string | null;
|
||||
status: string;
|
||||
name: string;
|
||||
categoryId: number | null;
|
||||
canonicalName: string | null;
|
||||
id: number;
|
||||
normalizedName: string;
|
||||
isActive: boolean;
|
||||
deletedAt: Date | null;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number;
|
||||
isPrivate: boolean;
|
||||
}) | null;
|
||||
} & {
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
productId: number | null;
|
||||
quantity: Prisma.Decimal | null;
|
||||
unit: string | null;
|
||||
rawName: string;
|
||||
rawLine: string | null;
|
||||
note: string | null;
|
||||
matchConfidence: number | null;
|
||||
matchSource: string | null;
|
||||
alternativeProductIds: Prisma.JsonValue | null;
|
||||
recipeId: number;
|
||||
analysisStatus: string | null;
|
||||
})[];
|
||||
} & {
|
||||
isPublic: boolean;
|
||||
name: string;
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number | null;
|
||||
description: string | null;
|
||||
instructions: string | null;
|
||||
imageUrl: string | null;
|
||||
servings: number | null;
|
||||
}>;
|
||||
addIngredient(id: number, ingredient: CreateIngredientDto, userId: number): Promise<{
|
||||
product: ({
|
||||
nutrition: {
|
||||
calories: number | null;
|
||||
protein: number | null;
|
||||
fat: number | null;
|
||||
carbohydrates: number | null;
|
||||
salt: number | null;
|
||||
sugar: number | null;
|
||||
fiber: number | null;
|
||||
id: number;
|
||||
productId: number;
|
||||
} | null;
|
||||
} & {
|
||||
category: string | null;
|
||||
status: string;
|
||||
name: string;
|
||||
categoryId: number | null;
|
||||
canonicalName: string | null;
|
||||
id: number;
|
||||
normalizedName: string;
|
||||
isActive: boolean;
|
||||
deletedAt: Date | null;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
ownerId: number;
|
||||
isPrivate: boolean;
|
||||
}) | null;
|
||||
} & {
|
||||
id: number;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
productId: number | null;
|
||||
quantity: Prisma.Decimal | null;
|
||||
unit: string | null;
|
||||
rawName: string;
|
||||
rawLine: string | null;
|
||||
note: string | null;
|
||||
matchConfidence: number | null;
|
||||
matchSource: string | null;
|
||||
alternativeProductIds: Prisma.JsonValue | null;
|
||||
recipeId: number;
|
||||
analysisStatus: string | null;
|
||||
}>;
|
||||
suggestRecipesFromInventory(userId: number): Promise<{
|
||||
suggestions: AiRecipeSuggestion[];
|
||||
}>;
|
||||
parseMarkdown(dto: ParseMarkdownDto): Promise<{
|
||||
name: string;
|
||||
description: string;
|
||||
instructions: string;
|
||||
ingredients: {
|
||||
rawName: string;
|
||||
rawLine: string;
|
||||
alternatives: string[];
|
||||
quantity: number;
|
||||
unit: string;
|
||||
note: string | null;
|
||||
suggestions: {
|
||||
productId: number;
|
||||
productName: string;
|
||||
score: number;
|
||||
}[];
|
||||
}[];
|
||||
}>;
|
||||
}
|
||||
Reference in New Issue
Block a user