페이징 적용, 장소 카테고리 추가

backend/.gitignore

@@ -58,3 +58,5 @@ pids
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+**.csv

backend/resources/sql/DDL.sql

@@ -33,10 +33,11 @@ CREATE TABLE PLACE
     google_place_id   CHAR(50) UNIQUE NOT NULL,
     name              VARCHAR(255)    NOT NULL,
     thumbnail_url     VARCHAR(255),
-    rating            FLOAT,
+    rating            DECIMAL(3, 2),
     longitude         DECIMAL(10, 7), -- 경도
     latitude          DECIMAL(10, 7), -- 위도
     formatted_address VARCHAR(255),
+    category          VARCHAR(50),
     description       TEXT,
     detail_page_url   VARCHAR(255),
     created_at        TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
@@ -64,7 +65,7 @@ CREATE TABLE MAP_PLACE
 (
     id          INT PRIMARY KEY AUTO_INCREMENT,
     place_id    INT       NOT NULL,
-    map_id      INT,
+    map_id      INT       NOT NULL,
     description TEXT,
     created_at  TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at  TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
@@ -94,7 +95,7 @@ CREATE TABLE COURSE_PLACE
     id          INT PRIMARY KEY AUTO_INCREMENT,
     `order`     INT       NOT NULL,
     place_id    INT       NOT NULL,
-    course_id   INT,
+    course_id   INT       NOT NULL,
     description TEXT,
     created_at  TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at  TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,

backend/resources/sql/Mock.sql

@@ -33,27 +33,27 @@ VALUES ('place1', 'Place 1', 'https://example.com/place1.jpg', 4.5, 127.001, 37.
 -- MAP 데이터 삽입
 INSERT INTO MAP (user_id, thumbnail_url, title, is_public, description)
 VALUES (1, 'https://example.com/map1.jpg', 'Map 1', TRUE, 'Description for Map 1'),
-       (2, 'https://example.com/map2.jpg', 'Map 2', FALSE, 'Description for Map 2'),
+       (2, 'https://example.com/map2.jpg', 'Map 2', TRUE, 'Description for Map 2'),
        (3, 'https://example.com/map3.jpg', 'Map 3', TRUE, 'Description for Map 3'),
-       (4, 'https://example.com/map4.jpg', 'Map 4', FALSE, 'Description for Map 4'),
+       (4, 'https://example.com/map4.jpg', 'Map 4', TRUE, 'Description for Map 4'),
        (5, 'https://example.com/map5.jpg', 'Map 5', TRUE, 'Description for Map 5'),
        (1, 'https://example.com/map6.jpg', 'Map 6', TRUE, 'Description for Map 6'),
-       (2, 'https://example.com/map7.jpg', 'Map 7', FALSE, 'Description for Map 7'),
+       (2, 'https://example.com/map7.jpg', 'Map 7', TRUE, 'Description for Map 7'),
        (3, 'https://example.com/map8.jpg', 'Map 8', TRUE, 'Description for Map 8'),
-       (4, 'https://example.com/map9.jpg', 'Map 9', FALSE, 'Description for Map 9'),
+       (4, 'https://example.com/map9.jpg', 'Map 9', TRUE, 'Description for Map 9'),
        (5, 'https://example.com/map10.jpg', 'Map 10', TRUE, 'Description for Map 10');
 
 -- COURSE 데이터 삽입
 INSERT INTO COURSE (user_id, thumbnail_url, title, is_public, description)
 VALUES (1, 'https://example.com/course1.jpg', 'Course 1', TRUE, 'Description for Course 1'),
-       (2, 'https://example.com/course2.jpg', 'Course 2', FALSE, 'Description for Course 2'),
+       (2, 'https://example.com/course2.jpg', 'Course 2', TRUE, 'Description for Course 2'),
        (3, 'https://example.com/course3.jpg', 'Course 3', TRUE, 'Description for Course 3'),
-       (4, 'https://example.com/course4.jpg', 'Course 4', FALSE, 'Description for Course 4'),
+       (4, 'https://example.com/course4.jpg', 'Course 4', TRUE, 'Description for Course 4'),
        (5, 'https://example.com/course5.jpg', 'Course 5', TRUE, 'Description for Course 5'),
        (1, 'https://example.com/course6.jpg', 'Course 6', TRUE, 'Description for Course 6'),
-       (2, 'https://example.com/course7.jpg', 'Course 7', FALSE, 'Description for Course 7'),
+       (2, 'https://example.com/course7.jpg', 'Course 7', TRUE, 'Description for Course 7'),
        (3, 'https://example.com/course8.jpg', 'Course 8', TRUE, 'Description for Course 8'),
-       (4, 'https://example.com/course9.jpg', 'Course 9', FALSE, 'Description for Course 9'),
+       (4, 'https://example.com/course9.jpg', 'Course 9', TRUE, 'Description for Course 9'),
        (5, 'https://example.com/course10.jpg', 'Course 10', TRUE, 'Description for Course 10');
 
 -- MAP_PLACE 데이터 삽입

backend/src/course/course.controller.ts

@@ -19,8 +19,15 @@ export class CourseController {
   constructor(private readonly courseService: CourseService) {}
 
   @Get()
-  async getCourseList(@Query('query') query?: string) {
-    return await this.courseService.searchCourse(query);
+  async getCourseList(
+    @Query('query') query?: string,
+    @Query('page') page?: number,
+    @Query('limit') limit?: number,
+  ) {
+    if (isNaN(page)) page = 1; // Todo. number 타입 선택적 매개변수일 때 NaN 으로 처리되어 추가. 다른 방법?
+    if (isNaN(limit)) limit = 10;
+
+    return await this.courseService.searchCourse(query, page, limit);
   }
 
   @Get('/my')

backend/src/course/course.repository.ts

@@ -11,6 +11,7 @@ export class CourseRepository extends SoftDeleteRepository<Course, number> {
 
   findAll(page: number, pageSize: number) {
     return this.find({
+      where: { isPublic: true },
       skip: (page - 1) * pageSize,
       take: pageSize,
     });

backend/src/course/dto/CourseDetailResponse.ts

@@ -1,5 +1,5 @@
 import { UserIconResponse } from '../../user/dto/UserIconResponse';
-import { PlaceResponse } from '../../place/dto/PlaceResponse';
+import { PlaceListResponse } from '../../place/dto/PlaceListResponse';
 import { DEFAULT_THUMBNAIL_URL } from './CourseListResponse';
 import { Course } from '../entity/course.entity';
 
@@ -12,7 +12,7 @@ export class CourseDetailResponse {
     readonly thumbnailUrl: string,
     readonly description: string,
     readonly pinCount: number,
-    readonly places: PlaceResponse[],
+    readonly places: PlaceListResponse[],
     readonly createdAt: Date,
     readonly updatedAt: Date,
   ) {}
@@ -38,7 +38,7 @@ export class CourseDetailResponse {
 export async function getPlacesResponseOfCourseWithOrder(course: Course) {
   return (await course.getPlacesWithComment()).map((place, index) => {
     return {
-      ...PlaceResponse.from(place.place),
+      ...PlaceListResponse.from(place.place),
       comment: place.comment,
       order: index + 1,
     };

backend/src/map/dto/MapDetailResponse.ts

@@ -1,6 +1,6 @@
 import { Map } from '../entity/map.entity';
 import { UserIconResponse } from '../../user/dto/UserIconResponse';
-import { PlaceResponse } from '../../place/dto/PlaceResponse';
+import { PlaceListResponse } from '../../place/dto/PlaceListResponse';
 import { DEFAULT_THUMBNAIL_URL } from './MapListResponse';
 
 export class MapDetailResponse {
@@ -12,15 +12,15 @@ export class MapDetailResponse {
     readonly thumbnailUrl: string,
     readonly description: string,
     readonly pinCount: number,
-    readonly places: PlaceResponse[],
+    readonly places: PlaceListResponse[],
     readonly createdAt: Date,
     readonly updatedAt: Date,
   ) {}
 
   static async from(map: Map) {
     const places = (await map.getPlacesWithComment()).map((place) => {
       return {
-        ...PlaceResponse.from(place.place),
+        ...PlaceListResponse.from(place.place),
         comment: place.comment,
       };
     });

backend/src/map/map.controller.ts

@@ -18,8 +18,15 @@ export class MapController {
   constructor(private readonly mapService: MapService) {}
 
   @Get()
-  async getMapList(@Query('query') query?: string) {
-    return await this.mapService.searchMap(query);
+  async getMapList(
+    @Query('query') query?: string,
+    @Query('page') page?: number,
+    @Query('limit') limit?: number,
+  ) {
+    if (isNaN(page)) page = 1; // Todo. number 타입 선택적 매개변수일 때 NaN 으로 처리되어 추가. 다른 방법?
+    if (isNaN(limit)) limit = 10;
+
+    return await this.mapService.searchMap(query, page, limit);
   }
 
   @Get('/my')

backend/src/map/map.repository.ts

@@ -11,6 +11,7 @@ export class MapRepository extends SoftDeleteRepository<Map, number> {
 
   findAll(page: number, pageSize: number) {
     return this.find({
+      where: { isPublic: true },
       skip: (page - 1) * pageSize,
       take: pageSize,
     });

backend/src/place/dto/CreatePlaceRequest.ts

@@ -3,6 +3,9 @@ import {
   IsNumber,
   IsString,
   ValidateNested,
+  Min,
+  Max,
+  IsUrl,
 } from 'class-validator';
 import { Place } from '../entity/place.entity';
 
@@ -15,10 +18,12 @@ export class CreatePlaceRequest {
   @IsNotEmpty()
   name: string;
 
-  @IsString()
+  @IsUrl()
   thumbnailUrl?: string;
 
   @IsNumber()
+  @Min(0)
+  @Max(5)
   rating?: number;
 
   @ValidateNested()
@@ -32,9 +37,12 @@ export class CreatePlaceRequest {
   formattedAddress?: string;
 
   @IsString()
-  description?: string;
+  category?: string;
 
   @IsString()
+  description?: string;
+
+  @IsUrl()
   detailPageUrl?: string;
 
   toEntity() {

backend/src/place/dto/PlaceResponse.ts → backend/src/place/dto/PlaceListResponse.ts

@@ -1,6 +1,6 @@
 import { Place } from '../entity/place.entity';
 
-export class PlaceResponse {
+export class PlaceListResponse {
   constructor(
     readonly id: number,
     readonly name: string,
@@ -9,14 +9,16 @@ export class PlaceResponse {
       readonly lng: number;
     },
     readonly google_place_id: string,
+    readonly category?: string,
+    readonly description?: string,
     readonly detail_page_url?: string,
     readonly thumbnail_url?: string,
     readonly rating?: number,
     readonly formed_address?: string,
   ) {}
 
-  static from(place: Place): PlaceResponse {
-    return new PlaceResponse(
+  static from(place: Place): PlaceListResponse {
+    return new PlaceListResponse(
       place.id,
       place.name,
       {
@@ -26,6 +28,8 @@ export class PlaceResponse {
       place.googlePlaceId,
       place.detailPageUrl,
       place.thumbnailUrl,
+      place.category,
+      place.description,
       place.rating,
       place.formattedAddress,
     );

backend/src/place/dto/PlaceSearchResponse.ts

@@ -0,0 +1,37 @@
+import { Place } from '../entity/place.entity';
+
+export class PlaceSearchResponse {
+  constructor(
+    readonly id: number,
+    readonly name: string,
+    readonly location: {
+      readonly lat: number;
+      readonly lng: number;
+    },
+    readonly google_place_id: string,
+    readonly category?: string,
+    readonly description?: string,
+    readonly detail_page_url?: string,
+    readonly thumbnail_url?: string,
+    readonly rating?: number,
+    readonly formed_address?: string,
+  ) {}
+
+  static from(place: Place): PlaceSearchResponse {
+    return new PlaceSearchResponse(
+      place.id,
+      place.name,
+      {
+        lat: place.latitude,
+        lng: place.longitude,
+      },
+      place.googlePlaceId,
+      place.detailPageUrl,
+      place.thumbnailUrl,
+      place.category,
+      place.description,
+      place.rating,
+      place.formattedAddress,
+    );
+  }
+}

backend/src/place/entity/place.entity.ts

@@ -24,6 +24,9 @@ export class Place extends BaseEntity {
   @Column({ nullable: true })
   formattedAddress?: string;
 
+  @Column({ nullable: true })
+  category?: string;
+
   @Column('text', { nullable: true })
   description?: string;
 

backend/src/place/place.controller.ts

@@ -12,8 +12,15 @@ export class PlaceController {
   }
 
   @Get()
-  async getPlaces(@Query('query') query?: string) {
-    return this.placeService.getPlaces(query);
+  async getPlaces(
+    @Query('query') query?: string,
+    @Query('page') page?: number,
+    @Query('limit') limit?: number,
+  ) {
+    if (isNaN(page)) page = 1; // Todo. number 타입 선택적 매개변수일 때 NaN 으로 처리되어 추가. 다른 방법?
+    if (isNaN(limit)) limit = 5;
+
+    return this.placeService.getPlaces(query, page, limit);
   }
 
   @Get('/:id')

backend/src/place/place.service.ts

@@ -3,6 +3,7 @@ import { PlaceRepository } from './place.repository';
 import { CreatePlaceRequest } from './dto/CreatePlaceRequest';
 import { PlaceNotFoundException } from './exception/PlaceNotFoundException';
 import { PlaceAlreadyExistsException } from './exception/PlaceAlreadyExistsException';
+import { PlaceSearchResponse } from './dto/PlaceSearchResponse';
 
 @Injectable()
 export class PlaceService {
@@ -31,14 +32,14 @@ export class PlaceService {
     if (!result.length) {
       throw new PlaceNotFoundException();
     }
-    return result;
+    return result.map(PlaceSearchResponse.from);
   }
 
   async getPlace(id: number) {
     const place = await this.placeRepository.findById(id);
     if (!place) {
       throw new PlaceNotFoundException(id);
     }
-    return place;
+    return PlaceSearchResponse.from(place);
   }
 }