Merge pull request #6 from Wanted-Free-Pre-Onboarding-Course-10/feature/

#3 Refactoring : 리스트 API 수정
Wanted-Free-Pre-Onboarding-Course-10 · Nov 16, 2021 · 17c75dd · 17c75dd
2 parents 734587e + d21ce98
commit 17c75dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
diff --git a/src/subject/subject.entity.ts b/src/subject/subject.entity.ts
@@ -3,6 +3,7 @@ import {
   CreateDateColumn,
   Entity,
   PrimaryGeneratedColumn,
+  UpdateDateColumn,
 } from 'typeorm';
 
 @Entity()
@@ -13,8 +14,8 @@ export class Subject {
   @CreateDateColumn({ name: 'created_at', nullable: false })
   createdAt: Date;
 
-  @Column({ name: 'last_modified', nullable: true })
-  last_modified: Date;
+  @UpdateDateColumn({ name: 'update_at', nullable: true })
+  updateAt: Date;
 
   @Column({ name: 'name', nullable: false })
   name: string;

diff --git a/src/subject/subject.service.ts b/src/subject/subject.service.ts
@@ -26,10 +26,12 @@ export class SubjectService {
   async getPostListByUpdate(pageInfo: GetListDto) {
     const nowDate = new Date();
     const dayOfMonth = nowDate.getDate();
+
     nowDate.setDate(dayOfMonth - 7);
     const subjectList = await this.subjectRepository
       .createQueryBuilder('subject')
-      .where(`subject.last_modified > ${moment(nowDate).format('YYYY-MM-DD')}`)
+      .where('subject.createdAt != subject.updateAt')
+      .andWhere(`subject.updateAt > ${moment(nowDate).format('YYYY-MM-DD')}`)
       .orderBy('subject.id', 'DESC')
       .limit(pageInfo.limit)
       .offset(pageInfo.offset)