blurting4

DevKor-github · Sep 18, 2024 · 5e9cd18 · 5e9cd18
1 parent 92d7daf
commit 5e9cd18
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/domain/blurting/blurting.service.ts b/src/domain/blurting/blurting.service.ts
@@ -197,10 +197,10 @@ export class BlurtingService {
     if (groupQueue.includes(user.id)) {
       return State.Matching;
     }
+    if (user.group && (await this.checkPartOver(user.group.id))) {
+      return State.Arrowing;
+    }
     if (user.group && this.checkGroupOver(user.group.id)) {
-      if (await this.checkPartOver(user.group.id)) {
-        return State.Arrowing;
-      }
       return State.Blurting;
     }
     if (user.group) {
@@ -349,10 +349,17 @@ export class BlurtingService {
 
   async checkPartOver(groupId: number): Promise<boolean> {
     const question = await this.questionRepository.findLatestByGroup(groupId);
+
     if (question.no % 3 === 0) {
-      return await this.checkAllAnswered(question.id);
+      return (
+        (await this.checkAllAnswered(question.id)) ||
+        question.createdAt.getTime() - new Date().getTime() > 60 * 60 * 1000
+      );
     }
-    return false;
+    return (
+      false ||
+      question.createdAt.getTime() - new Date().getTime() > 60 * 60 * 1000
+    );
   }
 
   async checkGroupOver(groupId: number): Promise<boolean> {

diff --git a/src/domain/entities/blurtingQuestion.entity.ts b/src/domain/entities/blurtingQuestion.entity.ts
@@ -1,5 +1,6 @@
 import {
   Column,
+  CreateDateColumn,
   Entity,
   ManyToOne,
   OneToMany,
@@ -18,6 +19,9 @@ export class BlurtingQuestionEntity {
   @Column()
   no: number;
 
+  @CreateDateColumn()
+  createdAt: Date;
+
   @Column()
   question: string;