fix: bugs fix

- visited ondelete cascade - visited count
HyejuSeon · Jun 28, 2022 · 4418d45 · 4418d45
1 parent 771c432
commit 4418d45
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 4 deletions.
diff --git a/back/src/landmarks/landmarks.entity.ts b/back/src/landmarks/landmarks.entity.ts
@@ -30,6 +30,8 @@ export class Landmark {
     @Column({ nullable: true })
     latitude: string;
 
-    @OneToMany(() => Visited, (visited) => visited.landmark)
+    @OneToMany(() => Visited, (visited) => visited.landmark, {
+        cascade: true,
+    })
     visited: Visited[];
 }
diff --git a/back/src/landmarks/landmarks.service.ts b/back/src/landmarks/landmarks.service.ts
@@ -72,4 +72,18 @@ export class LandmarksService {
             console.log(error);
         }
     }
+
+    async getLandmarkByLandmarkName(param): Promise<any> {
+        try {
+            const landmark = await this.landmarksRepository
+                .createQueryBuilder('landmark')
+                .select('landmark_id')
+                .where('landmark.name = :name', { name: param.landmark_name })
+                .getRawOne();
+
+            return landmark;
+        } catch (error) {
+            console.log(error);
+        }
+    }
 }
diff --git a/back/src/users/users.entity.ts b/back/src/users/users.entity.ts
@@ -43,7 +43,9 @@ export class Users extends BaseEntity {
     @Exclude() // 민감한 데이터는 응답에서 제외 가능
     hashedRefreshToken?: string;
 
-    @OneToMany(() => Visited, (visited) => visited.user)
+    @OneToMany(() => Visited, (visited) => visited.user, {
+        cascade: true,
+    })
     visited: Visited[];
 
     @OneToMany(() => Boards, (board) => board.user_id, {

diff --git a/back/src/visited/visited.controller.ts b/back/src/visited/visited.controller.ts
@@ -55,6 +55,26 @@ export class VisitedController {
         res.status(HttpStatus.OK).json(result);
     }
 
+    @Get('/count/:landmark_name')
+    @ApiOperation({ summary: '방문지 조회 with landmark_name' })
+    @ApiResponse({
+        status: 200,
+        description: 'Return visited by landmark_name',
+    })
+    async getVisitedByLandmarkName(
+        @Res() res: any,
+        @Param()
+        landmark_name: string,
+    ): Promise<void> {
+        const landmark = await this.landmarksService.getLandmarkByLandmarkName(
+            landmark_name,
+        );
+
+        const result = await this.visitedService.getCount(landmark.landmark_id);
+
+        res.status(HttpStatus.OK).json(result);
+    }
+
     @Get('/images/:imageId')
     @ApiOperation({ summary: '방문지 사진 받아오기' })
     @ApiResponse({

diff --git a/back/src/visited/visited.entity.ts b/back/src/visited/visited.entity.ts
@@ -24,14 +24,14 @@ export class Visited {
 
     @ManyToOne(() => Landmark, (landmark) => landmark.visited, {
         eager: true,
-        // onDelete: 'CASCADE',
+        onDelete: 'CASCADE',
     })
     @JoinColumn({ name: 'landmark_id' })
     landmark: Landmark;
 
     @ManyToOne(() => Users, (user) => user.visited, {
         eager: true,
-        // onDelete: 'CASCADE',
+        onDelete: 'CASCADE',
     })
     @JoinColumn({ name: 'user_id' })
     user: Users;