From fba5f538e3ea62ea6d11b263849115c48d659936 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Wed, 12 Feb 2025 18:14:43 +0900
Subject: [PATCH 1/2] =?UTF-8?q?CLAP-407=20Fix:=20task=20=ED=85=8C=EC=9D=B4?=
 =?UTF-8?q?=EB=B8=94=20=EC=9D=B8=EB=8D=B1=EC=8A=A4=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=9E=91=EC=97=85=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20?=
 =?UTF-8?q?=EB=8B=89=EB=84=A4=EC=9E=84=20=EA=B2=80=EC=83=89=20=EC=BF=BC?=
 =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #526
---
 .../task/TaskCustomRepositoryImpl.java          | 17 ++++++++---------
 src/main/resources/swagger.yml                  | 17 +++++++++++++++--
 taskflow.yaml                                   |  2 +-
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
index 7f9a026d..14d90e7d 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
@@ -40,7 +40,7 @@ public class TaskCustomRepositoryImpl implements TaskCustomRepository {
     public Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
         BooleanBuilder builder = createFilter(filterTaskListRequest);
         if (!filterTaskListRequest.nickName().isEmpty()) {
-            builder.and(taskEntity.processor.nickname.contains(filterTaskListRequest.nickName()));
+            builder.and(taskEntity.processor.nickname.startsWith(filterTaskListRequest.nickName()));
         }
         builder.and(taskEntity.requester.memberId.eq(requesterId));
 
@@ -51,7 +51,7 @@ public Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable page
     public Page<TaskEntity> findTasksAssignedByManager(Long processorId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
         BooleanBuilder builder = createFilter(filterTaskListRequest);
         if (!filterTaskListRequest.nickName().isEmpty()) {
-            builder.and(taskEntity.requester.nickname.contains(filterTaskListRequest.nickName()));
+            builder.and(taskEntity.requester.nickname.startsWith(filterTaskListRequest.nickName()));
         }
         builder.and(taskEntity.processor.memberId.eq(processorId));
 
@@ -102,7 +102,7 @@ private BooleanBuilder createFilterBuilder(Long memberId, FilterTeamStatusReques
     public Page<TaskEntity> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
         BooleanBuilder builder = createFilter(filterTaskListRequest);
         if (!filterTaskListRequest.nickName().isEmpty()) {
-            builder.and(taskEntity.requester.nickname.contains(filterTaskListRequest.nickName()));
+            builder.and(taskEntity.requester.nickname.startsWith(filterTaskListRequest.nickName()));
         }
         builder.and(taskEntity.taskStatus.eq(TaskStatus.REQUESTED));
         return getTasksPage(pageable, builder, filterTaskListRequest.sortBy(), filterTaskListRequest.sortDirection());
@@ -113,8 +113,8 @@ public Page<TaskEntity> findAllTasks(Pageable pageable, FilterTaskListRequest fi
         BooleanBuilder builder = createFilter(filterTaskListRequest);
         if (!filterTaskListRequest.nickName().isEmpty()) {
             builder.and(
-                    taskEntity.requester.nickname.contains(filterTaskListRequest.nickName())
-                            .or(taskEntity.processor.nickname.contains(filterTaskListRequest.nickName()))
+                    taskEntity.requester.nickname.startsWith(filterTaskListRequest.nickName())
+                            .or(taskEntity.processor.nickname.startsWith(filterTaskListRequest.nickName()))
             );
         }
         return getTasksPage(pageable, builder, filterTaskListRequest.sortBy(), filterTaskListRequest.sortDirection());
@@ -199,11 +199,10 @@ private Page<TaskEntity> getTasksPage(Pageable pageable, BooleanBuilder builder,
                 .limit(pageable.getPageSize())
                 .fetch();
         long total = queryFactory
-                .selectFrom(taskEntity)
-                .leftJoin(taskEntity.processor).fetchJoin()
-                .leftJoin(taskEntity.requester).fetchJoin()
+                .select(taskEntity.count())
+                .from(taskEntity)
                 .where(builder)
-                .fetch().size();
+                .fetchOne();
         return new PageImpl<>(result, pageable, total);
     }
 
diff --git a/src/main/resources/swagger.yml b/src/main/resources/swagger.yml
index 2514d791..070a468c 100644
--- a/src/main/resources/swagger.yml
+++ b/src/main/resources/swagger.yml
@@ -35,5 +35,18 @@ springdoc:
     path: /swagger/v3/api-docs
 
 ---
-spring.config.activate.on-profile: prod
-swagger.server.url: ${SWAGGER_SERVER_URL:http://localhost:8080}
\ No newline at end of file
+spring.config.activate.on-profile: "prod"
+swagger.server.url: ${SWAGGER_SERVER_URL:http://localhost:8080}
+
+springdoc:
+  default-consumes-media-type: application/json;charset=UTF-8
+  default-produces-media-type: application/json;charset=UTF-8
+  swagger-ui:
+    path: /swagger
+    tags-sorter: alpha
+    operations-sorter: method
+    display-request-duration: true
+    disable-swagger-default-url: true
+  show-actuator: true
+  api-docs:
+    path: /swagger/v3/api-docs
\ No newline at end of file
diff --git a/taskflow.yaml b/taskflow.yaml
index 8172ce6f..acedb39c 100644
--- a/taskflow.yaml
+++ b/taskflow.yaml
@@ -39,7 +39,7 @@ spec:
           image: clap.kr-central-2.kcr.dev/taskflow/taskflow-server:${IMAGE_TAG}
           imagePullPolicy: Always
           command: [ "java", "-jar", "app.jar" ]
-          args: [ "--spring.profiles.active=dev" ]
+          args: [ "--spring.profiles.active=prod" ]
           env:
             - name: TZ
               value: "Asia/Seoul"

From e27c5f741a84a3a27f562fd65c544e6577ab591b Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Wed, 12 Feb 2025 23:01:28 +0900
Subject: [PATCH 2/2] =?UTF-8?q?CLAP-104=20CI/CD:=20=EB=8F=84=EC=BB=A4=20?=
 =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=ED=83=9C=EA=B7=B8=20=EB=94=94?=
 =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9D=B4=EB=A8=BC=ED=8A=B8=EC=97=90=20?=
 =?UTF-8?q?=EB=B0=98=EC=98=81=ED=95=98=EB=8A=94=20=EB=B6=80=EB=B6=84=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #55
---
 .github/workflows/release-cd.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-cd.yml b/.github/workflows/release-cd.yml
index 52ac3d21..fa6dfc77 100644
--- a/.github/workflows/release-cd.yml
+++ b/.github/workflows/release-cd.yml
@@ -57,7 +57,7 @@ jobs:
           docker push ${{ secrets.DOCKER_REPO }}:latest
       - name: Update Kubernetes Deployment
         run: |
-          envsubst < ./taskflow.yaml
+          envsubst < ./taskflow.yaml > ./taskflow-back.yaml
         env:
           IMAGE_TAG: ${{ steps.version.outputs.VERSION }}
       # deploy
@@ -69,7 +69,7 @@ jobs:
           key: ${{ secrets.KUBE_HOST_KEY }}
           port: ${{ secrets.KUBE_HOST_PORT }}
           overwrite: true
-          source: ./taskflow.yaml
+          source: ./taskflow-back.yaml
           target: ~/taskflow-back.yaml
 
       - name: Deploy