diff --git a/backend/src/books/books.repository.ts b/backend/src/books/books.repository.ts index c06ac92d..8fb90b03 100644 --- a/backend/src/books/books.repository.ts +++ b/backend/src/books/books.repository.ts @@ -88,11 +88,7 @@ class BooksRepository extends Repository { sort: string, limit: number, ): Promise { - const orderingArr = [ - { createdAt: 'DESC', title: 'ASC' }, - { lendingCnt: 'DESC', title: 'ASC' }, - ]; - const ordering: any = sort === 'popular' ? orderingArr[1] : orderingArr[0]; + const order = sort === 'popular' ? 'lendingCnt' : 'createdAt'; const lendingCondition: string = sort === 'popular' ? 'and lending.createdAt >= date_sub(now(), interval 42 day)' : ''; @@ -119,7 +115,8 @@ class BooksRepository extends Repository { .leftJoin(Category, 'category', 'category.id = book_info.categoryId') .limit(limit) .groupBy('book_info.id') - .orderBy(ordering) + .orderBy(order, 'DESC') + .addOrderBy('title', 'ASC') .getRawMany(); return lendingBookList; } diff --git a/backend/src/reservations/reservations.repository.ts b/backend/src/reservations/reservations.repository.ts index 9ca60219..e98617e5 100644 --- a/backend/src/reservations/reservations.repository.ts +++ b/backend/src/reservations/reservations.repository.ts @@ -51,7 +51,7 @@ class ReservationsRepository extends Repository { } // 유저가 연체 중인지 확인 - async isOverdueUser(userId: number) { + async isOverdueUser(userId: number): Promise { return this.user .createQueryBuilder('u') .select('u.id') @@ -106,6 +106,7 @@ class ReservationsRepository extends Repository { return lenderableBookItemNum; } + // Todo: return 값 수정할 것 async alreadyLendedBooks(userId: number, bookInfoId: number) { const lendedBooks = this.lending .createQueryBuilder('l') @@ -117,6 +118,7 @@ class ReservationsRepository extends Repository { return lendedBooks; } + // Todo: return 값 수정할 것 async getReservedBooks(userId: number, bookInfoId: number) { const reservedBooks = this .createQueryBuilder('r') @@ -127,7 +129,7 @@ class ReservationsRepository extends Repository { return reservedBooks; } - async createReservation(userId: number, bookInfoId:number) { + async createReservation(userId: number, bookInfoId:number): Promise { await this.createQueryBuilder() .insert() .into(reservation) @@ -135,7 +137,7 @@ class ReservationsRepository extends Repository { .execute(); } - async searchReservations(query: string, filter: string, page: number, limit: number) { + async searchReservations(query: string, filter: string, page: number, limit: number): Promise<{ meta: Meta; items: reservation[] }> { const searchAll = this .createQueryBuilder('r') .select('r.id', 'reservationsId') @@ -173,7 +175,7 @@ class ReservationsRepository extends Repository { default: searchAll.andWhere({ status: 0, bookId: IsNull() }); } - const items = await searchAll.offset(limit * page).limit(limit).getRawMany(); + const items = await searchAll.offset(limit * page).limit(limit).getRawMany(); const totalItems = await searchAll.getCount(); const meta : Meta = { totalItems, diff --git a/backend/src/reviews/repository/reviews.repository.ts b/backend/src/reviews/repository/reviews.repository.ts index 2b1df603..636f854e 100644 --- a/backend/src/reviews/repository/reviews.repository.ts +++ b/backend/src/reviews/repository/reviews.repository.ts @@ -42,7 +42,7 @@ export default class ReviewsRepository extends Repository { page: number, sort: 'ASC' | 'DESC' | undefined, limit: number, - ) { + ): Promise { const reviews = this.createQueryBuilder('reviews') .select('reviews.id', 'reviewsId') .addSelect('reviews.userId', 'reviewerId') @@ -67,7 +67,7 @@ export default class ReviewsRepository extends Repository { } const ret = await reviews.offset(page * limit) .limit(limit) - .getRawMany(); + .getRawMany(); return ret; }