feat: добавлены базовые Vue компоненты для проекта Pizza

backend/src/controllers/address.controller.ts

@@ -21,12 +21,16 @@ import {
 import {Address} from '../models';
 import {AddressRepository} from '../repositories';
 import {authenticate} from '@loopback/authentication';
+import {inject} from '@loopback/core';
+import {SecurityBindings, UserProfile} from '@loopback/security';
 
 @authenticate('jwt')
 export class AddressController {
   constructor(
     @repository(AddressRepository)
     public addressRepository : AddressRepository,
+    @inject(SecurityBindings.USER)
+    private currentUserProfile: UserProfile,
   ) {}
 
   @post('/addresses')
@@ -41,7 +45,6 @@ export class AddressController {
           schema: {
             example: {
               name: "string",
-              userId: "string",
               street: "string",
               building: "string",
               flat: "string",
@@ -51,9 +54,13 @@ export class AddressController {
         },
       },
     })
-    address: Address,
+    address: Omit<Address, 'id' | 'userId'>,
   ): Promise<Address> {
-    return this.addressRepository.create(address);
+    const userId = this.currentUserProfile.id;
+    return this.addressRepository.create({
+      ...address,
+      userId: userId,
+    });
   }
 
   @oas.visibility(OperationVisibility.UNDOCUMENTED)
@@ -81,8 +88,10 @@ export class AddressController {
     },
   })
   async find(): Promise<Address[]> {
-    const addresses = await this.addressRepository.find();
-    return addresses.filter(address => !!address.userId);
+    const userId = this.currentUserProfile.id;
+    return this.addressRepository.find({
+      where: {userId: userId}
+    });
   }
 
   @oas.visibility(OperationVisibility.UNDOCUMENTED)

backend/src/controllers/order.controller.ts

@@ -25,6 +25,8 @@ import {
   PizzaRepository
 } from '../repositories';
 import {authenticate} from "@loopback/authentication";
+import {inject} from '@loopback/core';
+import {SecurityBindings, UserProfile} from '@loopback/security';
 
 export class OrderController {
   constructor(
@@ -38,6 +40,8 @@ export class OrderController {
     public pizzaIngredientRepository : PizzaIngredientRepository,
     @repository(PizzaRepository)
     public pizzaRepository : PizzaRepository,
+    @inject(SecurityBindings.USER, {optional: true})
+    private currentUserProfile?: UserProfile,
   ) {}
 
   @post('/orders')
@@ -60,6 +64,7 @@ export class OrderController {
               "userId": "string",
               "phone": "+7 999-999-99-99",
               "address": {
+                "name": "string",
                 "street": "string",
                 "building": "string",
                 "flat": "string",
@@ -99,29 +104,34 @@ export class OrderController {
     let addressId = address?.id;
     // if it is a new address
     if (address && !addressId) {
-      const name = `ул.${address.street}, д.${address.building}, кв.${address.flat}`;
-      const newAddress = await this.addressRepository.create({...address, name, userId});
+      const newAddress = await this.addressRepository.create({...address, userId});
       addressId = newAddress.id;
     }
     const newOrder = await this.orderRepository.create({...orderToSave, addressId});
-    for (const pizza of pizzas) {
-      const { ingredients, ...pizzaToSave } = pizza;
-      const newPizza = await this.pizzaRepository.create({
-        ...pizzaToSave,
-        orderId: newOrder.id
-      });
-      for (const ingredient of ingredients) {
-        await this.pizzaIngredientRepository.create({
-          ...ingredient,
-          pizzaId: newPizza.id
-        })
+    if (pizzas && Array.isArray(pizzas)) {
+      for (const pizza of pizzas) {
+        const { ingredients, ...pizzaToSave } = pizza;
+        const newPizza = await this.pizzaRepository.create({
+          ...pizzaToSave,
+          orderId: newOrder.id
+        });
+        if (ingredients && Array.isArray(ingredients)) {
+          for (const ingredient of ingredients) {
+            await this.pizzaIngredientRepository.create({
+              ...ingredient,
+              pizzaId: newPizza.id
+            })
+          }
+        }
       }
     }
-    for (const item of misc) {
-      await this.miscOrderRepository.create({
-        ...item,
-        orderId: newOrder.id
-      })
+    if (misc && Array.isArray(misc)) {
+      for (const item of misc) {
+        await this.miscOrderRepository.create({
+          ...item,
+          orderId: newOrder.id
+        })
+      }
     }
     return newOrder;
   }
@@ -195,7 +205,16 @@ export class OrderController {
     },
   })
   async find(): Promise<Order[]> {
+    const userId = this.currentUserProfile?.id;
+
+    if (!userId) {
+      throw new Error('User not authenticated');
+    }
+
     const filter = {
+      "where": {
+        "userId": String(userId)
+      },
       "include": [
         {
           "relation": "orderPizzas",
@@ -215,8 +234,7 @@ export class OrderController {
         }
       ]
     }
-    const orders = await this.orderRepository.find(filter);
-    return orders.filter(order => !!order.userId);
+    return await this.orderRepository.find(filter);
   }
 
   @oas.visibility(OperationVisibility.UNDOCUMENTED)

backend/src/factory/index.ts

@@ -58,23 +58,48 @@ const populateMisc = (
 };
 
 export default async function load(app: Application) {
-  const usersPromises = users.map(async user => populateUsers(user, await app.getRepository(UserRepository)))
-  await Promise.all(usersPromises);
+  const doughRepository = await app.getRepository(DoughRepository);
+  const ingredientRepository = await app.getRepository(IngredientRepository);
+  const sauceRepository = await app.getRepository(SauceRepository);
+  const sizeRepository = await app.getRepository(SizeRepository);
+  const miscRepository = await app.getRepository(MiscRepository);
+  const userRepository = await app.getRepository(UserRepository);
 
-  const doughPromises = pizza.dough.map(async dough => populateDough(dough, await app.getRepository(DoughRepository)))
-  await Promise.all(doughPromises);
+  const existingDough = await doughRepository.count();
+  if (existingDough.count === 0) {
+    const doughPromises = pizza.dough.map(async dough => populateDough(dough, doughRepository))
+    await Promise.all(doughPromises);
+  }
 
-  const ingredientsPromises = pizza.ingredients.map(async ing => populateIngredients(ing, await app.getRepository(IngredientRepository)))
-  await Promise.all(ingredientsPromises);
+  const existingIngredients = await ingredientRepository.count();
+  if (existingIngredients.count === 0) {
+    const ingredientsPromises = pizza.ingredients.map(async ing => populateIngredients(ing, ingredientRepository))
+    await Promise.all(ingredientsPromises);
+  }
 
-  const saucesPromises = pizza.sauces.map(async sauce => populateSauces(sauce, await app.getRepository(SauceRepository)))
-  await Promise.all(saucesPromises);
+  const existingSauces = await sauceRepository.count();
+  if (existingSauces.count === 0) {
+    const saucesPromises = pizza.sauces.map(async sauce => populateSauces(sauce, sauceRepository))
+    await Promise.all(saucesPromises);
+  }
 
-  const sizesPromises = pizza.sizes.map(async size => populateSizes(size, await app.getRepository(SizeRepository)))
-  await Promise.all(sizesPromises);
+  const existingSizes = await sizeRepository.count();
+  if (existingSizes.count === 0) {
+    const sizesPromises = pizza.sizes.map(async size => populateSizes(size, sizeRepository))
+    await Promise.all(sizesPromises);
+  }
 
-  const miscPromises = misc.map(async m => populateMisc(m, await app.getRepository(MiscRepository)))
-  await Promise.all(miscPromises);
+  const existingMisc = await miscRepository.count();
+  if (existingMisc.count === 0) {
+    const miscPromises = misc.map(async m => populateMisc(m, miscRepository))
+    await Promise.all(miscPromises);
+  }
+
+  const existingUsers = await userRepository.count();
+  if (existingUsers.count === 0) {
+    const usersPromises = users.map(async user => populateUsers(user, userRepository))
+    await Promise.all(usersPromises);
+  }
 
   console.log('Dummy data is populated')
 }

backend/src/models/order.model.ts

@@ -38,6 +38,12 @@ export class Order extends Entity {
   })
   phone?: String;
 
+  @property({
+    type: 'string',
+    required: false,
+  })
+  comment?: string;
+
   @property({
     type: 'array',
     required: false,

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   db:
     image: postgres