Skip to content

CLAP-104 도커 이미지 태그 디플로이먼트에 반영하는 부분 수정 #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hyoseong-Choi wants to merge 4 commits into from
Closed

CLAP-104 도커 이미지 태그 디플로이먼트에 반영하는 부분 수정 #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fba5f53
CLAP-407 Fix: task 테이블 인덱스 추가 및 작업 조회시 닉네임 검색 쿼리 수정
hyoseong-Choi Feb 12, 2025
458de6e
Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-S…
hyoseong-Choi Feb 12, 2025
e27c5f7
CLAP-104 CI/CD: 도커 이미지 태그 디플로이먼트에 반영하는 부분 수정
hyoseong-Choi Feb 12, 2025
7225b53
Merge branch 'release' into CLAP-104
hyoseong-Choi Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
17 changes: 8 additions & 9 deletions ...va/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand All @@ -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));

Expand Down Expand Up @@ -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());
Expand All @@ -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());
Expand Down Expand Up @@ -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);
}

Expand Down
1 change: 0 additions & 1 deletion src/main/resources/swagger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ springdoc:
api-docs:
path: /swagger/v3/api-docs

---
---
spring.config.activate.on-profile: "prod"
swagger.server.url: ${SWAGGER_SERVER_URL:http://localhost:8080}
Expand Down