....

Author: Ryeolee

src/domain/template/application/service/TemplateCollector.ts

@@ -18,11 +18,6 @@ export abstract class TemplateCollector {
     userChallengeData?: UserChallenge,
   ): boolean;
 
-  protected abstract getAdditionalConditions(
-    questionContent: QuestionContent | DefaultQuestionContent | undefined,
-    userChallengeData?: UserChallenge,
-  ): boolean;
-
   public mergeTemplates(
     affiliationData: Affiliation,
     userTemplateDatas: UserTemplate[],
@@ -84,7 +79,7 @@ export abstract class TemplateCollector {
         )
           ? '1'
           : '0';
-        if (this.getAdditionalConditions(questionContent, userChallengeData)) {
+        if (this.getAdditionalCondition(questionContent, userChallengeData)) {
           const affiliation = this.getAffiliation(affiliationData, userChallengeData);
           acc.push({
             position: affiliation.getPosition(),

src/domain/template/application/service/implement/TemplateQueryByDate.ts

@@ -64,6 +64,7 @@ export class TemplateQueryByDate
     userChallengeDatas: UserChallenge[],
     status: ChallengeStatusEnum,
   ) {
+    console.log(userChallengeDatas);
     const questionIds = this.dataMapperService.extractQuestionIds(userTemplateData, status);
     const questionData =
       status === ChallengeStatusEnum.WRITON
@@ -78,7 +79,7 @@ export class TemplateQueryByDate
             questionData,
             userChallengeDatas,
           )
-        : super.mergeTemplates(affiliationData, userTemplateData, questionData);
+        : super.mergeTemplates(affiliationData, userTemplateData, questionData, userChallengeDatas);
     const sortedCompanyData =
       status === ChallengeStatusEnum.WRITON
         ? sortCompanyPublicArrayForObject(mergedForManyTemplates)
@@ -101,13 +102,6 @@ export class TemplateQueryByDate
     return !!questionContent && !!userChallengeData;
   }
 
-  protected getAdditionalConditions(
-    questionContent: QuestionContent | undefined,
-    userChallengeData?: UserChallenge,
-  ): boolean {
-    return !!questionContent;
-  }
-
   private extractUserChallengeId(userChallenge: UserChallenge[]) {
     return userChallenge.map((data) => data.getId());
   }