From e74db64a6b076e3c2008e32939fe55076a40eadc Mon Sep 17 00:00:00 2001 From: scarf Date: Wed, 14 Jun 2023 15:14:23 +0900 Subject: [PATCH 1/6] =?UTF-8?q?refactor:=20`getReviewsPage`=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/reviews/repository/reviews.repository.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } From 2f4af48d34e7e78530db745e51f5d65ca02fede1 Mon Sep 17 00:00:00 2001 From: jhmin95 Date: Wed, 14 Jun 2023 15:18:34 +0900 Subject: [PATCH 2/6] =?UTF-8?q?FEAT:=20any=20=EB=B0=98=ED=99=98=ED=95=98?= =?UTF-8?q?=EB=8A=94=20reservations=20repository=20=EC=9D=98=20serarchRese?= =?UTF-8?q?rvations()=20=20=EC=97=90=20=ED=83=80=EC=9E=85=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/reservations/reservations.repository.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/reservations/reservations.repository.ts b/backend/src/reservations/reservations.repository.ts index 9ca60219..b64fd388 100644 --- a/backend/src/reservations/reservations.repository.ts +++ b/backend/src/reservations/reservations.repository.ts @@ -173,7 +173,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, From e95434cabfe949597603dc944ea640895fef0e9c Mon Sep 17 00:00:00 2001 From: jhmin95 Date: Wed, 14 Jun 2023 15:20:35 +0900 Subject: [PATCH 3/6] =?UTF-8?q?FEAT:=20reservations.repository.ts=20?= =?UTF-8?q?=EC=9D=98=20=ED=95=A8=EC=88=98=EC=97=90=20=EB=AA=85=EC=8B=9C?= =?UTF-8?q?=EC=A0=81=EC=9D=B8=20=EB=A6=AC=ED=84=B4=EA=B0=92=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/reservations/reservations.repository.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/reservations/reservations.repository.ts b/backend/src/reservations/reservations.repository.ts index b64fd388..f6ee6094 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') @@ -127,7 +127,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 +135,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') From 92e03e955ab0755fc23f682640a13fa1e39dfdec Mon Sep 17 00:00:00 2001 From: jhmin95 Date: Wed, 14 Jun 2023 15:27:11 +0900 Subject: [PATCH 4/6] =?UTF-8?q?CHORE:=20Todo=20=EC=B6=94=EA=B0=80.=20Repos?= =?UTF-8?q?itory=20=ED=95=A8=EC=88=98=EC=97=90=EC=84=9C=20Select=20Query?= =?UTF-8?q?=20Builder=20=ED=83=80=EC=9E=85=EC=9D=84=20=EB=A6=AC=ED=84=B4?= =?UTF-8?q?=ED=95=98=EA=B3=A0=20=EC=9E=88=EC=9D=8C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/reservations/reservations.repository.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/src/reservations/reservations.repository.ts b/backend/src/reservations/reservations.repository.ts index f6ee6094..e98617e5 100644 --- a/backend/src/reservations/reservations.repository.ts +++ b/backend/src/reservations/reservations.repository.ts @@ -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') From 145e10f36f4543961b763854cbbc1133ff3ea946 Mon Sep 17 00:00:00 2001 From: scarf Date: Wed, 14 Jun 2023 15:29:00 +0900 Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20=EC=B5=9C=EC=8B=A0=20`orderBy`?= =?UTF-8?q?=20API=20=EC=82=AC=EC=9A=A9,=20any=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/books/books.repository.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/backend/src/books/books.repository.ts b/backend/src/books/books.repository.ts index c06ac92d..24796177 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('title', 'ASC') + .orderBy(order, 'DESC') .getRawMany(); return lendingBookList; } From 8a2bbf2de17da8151bd21cedca67b177b073b0d0 Mon Sep 17 00:00:00 2001 From: "Ji-Hyuck, Min" <45284810+jhMin95@users.noreply.github.com> Date: Tue, 20 Jun 2023 10:23:23 +0900 Subject: [PATCH 6/6] Update backend/src/books/books.repository.ts orderBy() -> addOrderBy() Co-authored-by: scarf --- backend/src/books/books.repository.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/books/books.repository.ts b/backend/src/books/books.repository.ts index 24796177..8fb90b03 100644 --- a/backend/src/books/books.repository.ts +++ b/backend/src/books/books.repository.ts @@ -115,8 +115,8 @@ class BooksRepository extends Repository { .leftJoin(Category, 'category', 'category.id = book_info.categoryId') .limit(limit) .groupBy('book_info.id') - .orderBy('title', 'ASC') .orderBy(order, 'DESC') + .addOrderBy('title', 'ASC') .getRawMany(); return lendingBookList; }