Merge branch 'data-generator'

Water9Tree · Aug 9, 2023 · a553ca5 · a553ca5
2 parents 80f016c + 40900c9
commit a553ca5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/src/buildings/buildings.repository.ts b/src/buildings/buildings.repository.ts
@@ -64,13 +64,13 @@ export class BuildingsRepository {
       const buildingDoc = await this.buildingModel.findOneAndUpdate(
         { buildingNumber: buildingNumber, 'floors.floorNumber': floorNumber },
         {
-          $push: {
-            'floors.$.trashCans': {
+          $set: {
+            'floors.$.trashCan': {
               status: {
-                regular: null,
-                bottle: null,
-                plastic: null,
-                paper: null,
+                regular: 0,
+                bottle: 0,
+                plastic: 0,
+                paper: 0,
               },
             },
           },

diff --git a/src/buildings/floors/cans/cans.controller.ts b/src/buildings/floors/cans/cans.controller.ts
@@ -5,7 +5,7 @@ import { CansService } from './cans.service';
 export class CansController {
   constructor(private readonly cansService: CansService) {}
 
-  @Post('/buildings/:buildingNumber/floors/:floorNumber/cans')
+  @Post('/buildings/:buildingNumber/floors/:floorNumber/can')
   createTrashCan(
     @Param('buildingNumber') buildingNumber: number,
     @Param('floorNumber') floorNumber: number,

diff --git a/src/buildings/floors/cans/cans.service.ts b/src/buildings/floors/cans/cans.service.ts
@@ -4,6 +4,7 @@ import { BuildingsRepository } from 'src/buildings/buildings.repository';
 @Injectable()
 export class CansService {
   constructor(private readonly buildingRepository: BuildingsRepository) {}
+
   createCan({
     buildingNumber,
     floorNumber,
@@ -29,14 +30,9 @@ export class CansService {
         return res.map(({ buildingNumber, buildingName, floors }) => ({
           buildingNumber,
           buildingName,
-          floors: floors.map(({ floorNumber, trashCans }) => ({
+          floors: floors.map(({ floorNumber, trashCan }) => ({
             floorNumber,
-            trashCans: trashCans.map(({ _id, status }) => {
-              return {
-                canId: _id,
-                status,
-              };
-            }),
+            trashCan,
           })),
         }));
       })

diff --git a/src/buildings/floors/entities/floor.entity.ts b/src/buildings/floors/entities/floor.entity.ts
@@ -9,8 +9,8 @@ export class Floor {
   @Prop()
   floorNumber: number;
 
-  @Prop([Can])
-  trashCans: Can[];
+  @Prop(Can)
+  trashCan: Can;
 
   @Prop({ default: new Date(), type: mongoose.Schema.Types.Date })
   createdAt: Date;