Merge pull request #1085 from academic-relations/dev

Merge dev into main
academic-relations · Sep 19, 2024 · c49c3a8 · c49c3a8
2 parents ff3c491 + 5e118ca
commit c49c3a8
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 75 deletions.
diff --git a/...api/src/feature/registration/club-registration/repository/club-registration.repository.ts b/...api/src/feature/registration/club-registration/repository/club-registration.repository.ts
@@ -143,6 +143,15 @@ export class ClubRegistrationRepository {
 
       let professor;
       if (body.professor) {
+        professor = await tx
+          .insert(Professor)
+          .values({
+            email: body.professor.email,
+            name: body.professor.name,
+          })
+          .onDuplicateKeyUpdate({
+            set: { name: body.professor.name },
+          });
         professor = await tx
           .select({
             id: Professor.id,
@@ -157,44 +166,19 @@ export class ClubRegistrationRepository {
           )
           .for("share")
           .then(takeUnique);
-        if (!professor) {
-          professor = await tx
-            .insert(Professor)
-            .values({
-              email: body.professor.email,
-              name: body.professor.name,
-            })
-            .onDuplicateKeyUpdate({
-              set: { name: body.professor.name },
-            });
-          professor = await tx
-            .select({
-              id: Professor.id,
-            })
-            .from(Professor)
-            .where(
-              and(
-                eq(Professor.email, body.professor.email),
-                eq(Professor.name, body.professor.name),
-                isNull(Professor.deletedAt),
-              ),
-            )
-            .for("share")
-            .then(takeUnique);
 
-          logger.debug(professor);
+        logger.debug(professor);
 
-          await tx
-            .insert(ProfessorT)
-            .values({
-              professorId: professor.id,
-              professorEnum: body.professor.professorEnumId,
-              startTerm: cur,
-            })
-            .onDuplicateKeyUpdate({
-              set: { professorEnum: body.professor.professorEnumId },
-            });
-        }
+        await tx
+          .insert(ProfessorT)
+          .values({
+            professorId: professor.id,
+            professorEnum: body.professor.professorEnumId,
+            startTerm: cur,
+          })
+          .onDuplicateKeyUpdate({
+            set: { professorEnum: body.professor.professorEnumId },
+          });
       }
 
       // registration insert 후 id 가져오기
@@ -271,6 +255,15 @@ export class ClubRegistrationRepository {
 
       let professor;
       if (body.professor) {
+        professor = await tx
+          .insert(Professor)
+          .values({
+            email: body.professor.email,
+            name: body.professor.name,
+          })
+          .onDuplicateKeyUpdate({
+            set: { name: body.professor.name },
+          });
         professor = await tx
           .select({
             id: Professor.id,
@@ -285,44 +278,19 @@ export class ClubRegistrationRepository {
           )
           .for("share")
           .then(takeUnique);
-        if (!professor) {
-          professor = await tx
-            .insert(Professor)
-            .values({
-              email: body.professor.email,
-              name: body.professor.name,
-            })
-            .onDuplicateKeyUpdate({
-              set: { name: body.professor.name },
-            });
-          professor = await tx
-            .select({
-              id: Professor.id,
-            })
-            .from(Professor)
-            .where(
-              and(
-                eq(Professor.email, body.professor.email),
-                eq(Professor.name, body.professor.name),
-                isNull(Professor.deletedAt),
-              ),
-            )
-            .for("share")
-            .then(takeUnique);
 
-          logger.debug(professor);
+        logger.debug(professor);
 
-          await tx
-            .insert(ProfessorT)
-            .values({
-              professorId: professor.id,
-              professorEnum: body.professor.professorEnumId,
-              startTerm: cur,
-            })
-            .onDuplicateKeyUpdate({
-              set: { professorEnum: body.professor.professorEnumId },
-            });
-        }
+        await tx
+          .insert(ProfessorT)
+          .values({
+            professorId: professor.id,
+            professorEnum: body.professor.professorEnumId,
+            startTerm: cur,
+          })
+          .onDuplicateKeyUpdate({
+            set: { professorEnum: body.professor.professorEnumId },
+          });
       }
 
       const [result] = await tx
@@ -343,7 +311,6 @@ export class ClubRegistrationRepository {
           registrationClubRuleFileId: body.clubRuleFileId,
           registrationExternalInstructionFileId: body.externalInstructionFileId,
           registrationApplicationStatusEnumId: RegistrationStatusEnum.Pending,
-          professorApprovedAt: null,
         })
         .where(
           and(

diff --git a/packages/interface/src/api/file/apiFil001.ts b/packages/interface/src/api/file/apiFil001.ts
@@ -21,7 +21,7 @@ const requestBody = z.object({
   metadata: z.array(
     z.object({
       name: zFileName,
-      type: z.coerce.string().max(30),
+      type: z.coerce.string().max(256),
       size: z.coerce.number().int().min(1),
     }),
   ),

diff --git a/packages/web/src/features/register-club/components/_atomic/PastActivityReportModal.tsx b/packages/web/src/features/register-club/components/_atomic/PastActivityReportModal.tsx
@@ -220,7 +220,7 @@ const PastActivityReportModal: React.FC<PastActivityReportModalProps> = ({
                       key={`${index.toString()}`}
                     >
                       <Typography fs={14} lh={16} color="GRAY.600">
-                        {formatSlashDateTime(comment.createdAt)} ㅁㄴㅇㅁㄴㅇ
+                        {formatSlashDateTime(comment.createdAt)}
                       </Typography>
                       <Typography fs={16} lh={24}>
                         {comment.content}