Code

CLAP-327 팀 현황 필터링 조회 정렬 위치 수정#410

Code

Closed

hyoseong-Choi wants to merge 94 commits intodevelopTaskFlow-CLAP/TaskFlow-Server:developfrom CLAP-327TaskFlow-CLAP/TaskFlow-Server:CLAP-327Copy head branch name to clipboard

+9-20

Commits

Commits on Jan 26, 2025

• CLAP-110 Feature : 담당자별 작업 처리량 조회 API 구현

  Show description for 5155ff7
  hyoseong-Choi

  committed
  5155ff7

  Copy full SHA for 5155ff7

• CLAP-111 Refactor : 통계 조회 API 리팩토링 및 기능 수정

  Show description for b7f2c2a
  hyoseong-Choi

  committed
  b7f2c2a

  Copy full SHA for b7f2c2a

• 내 작업한 내용에 대한 설명

  

  nano-mm

  authored and

  hyoseong-Choi

  committed
  87d0fdb

  Copy full SHA for 87d0fdb

• 담당자 조회 API 구현

  

  nano-mm

  authored and

  hyoseong-Choi

  committed
  534aa24

  Copy full SHA for 534aa24

• CLAP-111 Refactor : 통계 조회 API 주소 통합, 리팩토링, 예외처리

  Show description for 2b7f448
  hyoseong-Choi

  committed
  2b7f448

  Copy full SHA for 2b7f448

• Bug : 프로퍼티파일 수정

  hyoseong-Choi

  committed
  72a66e4

  Copy full SHA for 72a66e4

• CLAP-104 CI/CD : CI에서 s3.yml 파일 생성하도록 수정

  hyoseong-Choi

  committed
  8458cbd

  Copy full SHA for 8458cbd

• CLAP-146 Feature : 카테고리 목록 조회 API 구현

  Show description for eb34ee8
  hyoseong-Choi

  committed
  eb34ee8

  Copy full SHA for eb34ee8

• CLAP-147 Feature : 카테고리 수정 API 구현

  Show description for 8146776
  hyoseong-Choi

  committed
  8146776

  Copy full SHA for 8146776

Commits on Jan 28, 2025

• CLAP-147 Feature : 카테고리 추가, 수정 API 리뷰반영 수정

  Show description for d24fdf8
  hyoseong-Choi

  committed
  d24fdf8

  Copy full SHA for d24fdf8

• CLAP-148 Feature : 카테고리 삭제 API 구현

  Show description for a0ebd44
  hyoseong-Choi

  committed
  a0ebd44

  Copy full SHA for a0ebd44

• Merge branch 'develop' into CLAP-148

  hyoseong-Choi

  authored
  5fcc496

  Copy full SHA for 5fcc496

• CLAP-148 Feature : 카테고리 삭제 API 수정

  Show description for 0ff4b3b
  hyoseong-Choi

  committed
  0ff4b3b

  Copy full SHA for 0ff4b3b

• CLAP-148 Docs : 카테고리 API 스웨거 수정

  Show description for eefe6ee
  hyoseong-Choi

  committed
  eefe6ee

  Copy full SHA for eefe6ee

Commits on Jan 29, 2025

• CLAP-107 Bug : CI test yml파일 key 중복 수정

  Show description for b30cdde
  hyoseong-Choi

  committed
  b30cdde

  Copy full SHA for b30cdde

Commits on Jan 30, 2025

• CLAP-148 Feature : 카테고리 CUD 리뷰 반영 수정, 조회 반환 양식 수정

  Show description for c3292fe
  hyoseong-Choi

  committed
  c3292fe

  Copy full SHA for c3292fe

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  2d63e7e

  Copy full SHA for 2d63e7e

Commits on Feb 2, 2025

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  5085370

  Copy full SHA for 5085370

• CLAP-214 Cleanup : 통계, 카테고리 미흡한부분 리팩토링

  Show description for 915e6f9
  hyoseong-Choi

  committed
  915e6f9

  Copy full SHA for 915e6f9

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  27e09cc

  Copy full SHA for 27e09cc

• CLAP-214 Fix : 통계조회 API 파라미터 바인딩 오류 수정

  Show description for 68c9f08
  hyoseong-Choi

  committed
  68c9f08

  Copy full SHA for 68c9f08

• CLAP-214 Fix : addConverter 수정

  Show description for 4f338ad
  hyoseong-Choi

  committed
  4f338ad

  Copy full SHA for 4f338ad

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  51ab7a5

  Copy full SHA for 51ab7a5

• CLAP-214 Hotfix : 추가한 파일들 제거

  Show description for 67fc667
  hyoseong-Choi

  committed
  67fc667

  Copy full SHA for 67fc667

• CLAP-214 Hotfix : FindStatisticsController 스위치문 수정

  Show description for e4dc477
  hyoseong-Choi

  committed
  e4dc477

  Copy full SHA for e4dc477

• CLAP-214 Hotfix : AddCategoryService 지연로딩 오류 수정

  Show description for 4875e32
  hyoseong-Choi

  committed
  4875e32

  Copy full SHA for 4875e32

Commits on Feb 3, 2025

• CLAP-214 Hotfix : DeleteCategoryService 카테고리 삭제 로직 수정

  Show description for ebd4bcd
  hyoseong-Choi

  committed
  ebd4bcd

  Copy full SHA for ebd4bcd

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  3e2f5ed

  Copy full SHA for 3e2f5ed

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  4a5e4f0

  Copy full SHA for 4a5e4f0

• CLAP-249 Refactor : 통계 조회 서비스 리팩토링

  Show description for a2292c8
  hyoseong-Choi

  committed
  a2292c8

  Copy full SHA for a2292c8

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  520f47f

  Copy full SHA for 520f47f

• CLAP-250 Test : 통계 조회 테스트코드 작성

  Show description for 93531b5
  hyoseong-Choi

  committed
  93531b5

  Copy full SHA for 93531b5

Commits on Feb 4, 2025

• CLAP-214 Hotifx : 카테고리 수정 로직 수정

  Show description for 280d930
  hyoseong-Choi

  committed
  280d930

  Copy full SHA for 280d930

• CLAP-214 Hotifx : 카테고리 수정 로직 수정

  Show description for 7be324a
  hyoseong-Choi

  committed
  7be324a

  Copy full SHA for 7be324a

• CLAP-256 fix: 스웨거 명세 추가

  nano-mm

  committed
  2381888

  Copy full SHA for 2381888

Commits on Feb 5, 2025

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  e291921

  Copy full SHA for e291921

• CLAP-214 Hotifx : 카테고리 저장 트랜잭션 추가

  Show description for efaaee3
  hyoseong-Choi

  committed
  efaaee3

  Copy full SHA for efaaee3

• CLAP-214 Hotifx : 카테고리 저장 시간 수정

  Show description for 0e10e86
  hyoseong-Choi

  committed
  0e10e86

  Copy full SHA for 0e10e86

• CLAP-285 Hotifx : 모든 카테고리 조회

  Show description for 40bc614
  hyoseong-Choi

  committed
  40bc614

  Copy full SHA for 40bc614

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  Show description for 876c3ef
  hyoseong-Choi

  committed
  876c3ef

  Copy full SHA for 876c3ef

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  6ec2bd9

  Copy full SHA for 6ec2bd9

• CLAP-214 Hotifx : 카테고리 조회 Secured 설정

  Show description for 14db203
  hyoseong-Choi

  committed
  14db203

  Copy full SHA for 14db203

• CLAP-256 fix: convert 동작 mapper 추가

  nano-mm

  committed
  d87498c

  Copy full SHA for d87498c

• CLAP-256 fix: conflict 해결

  nano-mm

  committed
  bad0cef

  Copy full SHA for bad0cef

Commits on Feb 6, 2025

• CLAP-256 fix: 충돌해결

  nano-mm

  committed
  844b838

  Copy full SHA for 844b838

• CLAP-256 fix: 불필요한 테스트 파일 제거

  nano-mm

  committed
  893715e

  Copy full SHA for 893715e

• CLAP-256 fix: 충돌 재해결

  nano-mm

  committed
  5b0b58e

  Copy full SHA for 5b0b58e

• CLAP-256 fix: mapper statuslabel 수정

  nano-mm

  committed
  0e4b6d7

  Copy full SHA for 0e4b6d7

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  06b3279

  Copy full SHA for 06b3279

• Merge branch 'CLAP-256-팀-작업-현황-에러-재수정' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  d5c2a68

  Copy full SHA for d5c2a68

• CLAP-256 Fix : 팀 작업 현황 필터링 조회 수정

  Show description for edca909
  hyoseong-Choi

  committed
  edca909

  Copy full SHA for edca909

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  5626fd3

  Copy full SHA for 5626fd3

• CLAP-299 Feature : 사용자 작업 취소

  Show description for b6929d6
  hyoseong-Choi

  committed
  b6929d6

  Copy full SHA for b6929d6

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  95b1c26

  Copy full SHA for 95b1c26

• CLAP-299 Fix: 사용자 작업 취소 api 주소 수정

  Show description for 3beb7c6
  hyoseong-Choi

  committed
  3beb7c6

  Copy full SHA for 3beb7c6

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  06e152f

  Copy full SHA for 06e152f

• CLAP-256 전체 작업수 계산 로직 개선

  nano-mm

  committed
  2bcb8f0

  Copy full SHA for 2bcb8f0

• fix: env 파일 제거

  nano-mm

  authored
  016b7cb

  Copy full SHA for 016b7cb

• Merge branch 'CLAP-256-팀-작업-현황-에러-재수정' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  e857375

  Copy full SHA for e857375

• fix: 어노테이션 수정

  nano-mm

  committed
  0ddbf8e

  Copy full SHA for 0ddbf8e

• fix: @RestController 제거

  nano-mm

  authored
  0a35db0

  Copy full SHA for 0a35db0

• fix: @ApplicationService로 수정

  nano-mm

  authored
  9605488

  Copy full SHA for 9605488

• Merge branch 'CLAP-256-팀-작업-현황-에러-재수정' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into CLAP-256-팀-작업-현황-에러-재수정

  nano-mm

  committed
  fd10e3e

  Copy full SHA for fd10e3e

• Merge branch 'develop' into CLAP-256-팀-작업-현황-에러-재수정

  hyoseong-Choi

  authored
  244f408

  Copy full SHA for 244f408

• Merge branch 'CLAP-256-팀-작업-현황-에러-재수정' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  8c780cb

  Copy full SHA for 8c780cb

• CLAP-256 Fix : TeamStatusService 누락된 import 수정

  Show description for 9a88797
  hyoseong-Choi

  committed
  9a88797

  Copy full SHA for 9a88797

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  0613040

  Copy full SHA for 0613040

• CLAP-256 Fix : TeamStatusService Secured 추가

  Show description for 8aa18d2
  hyoseong-Choi

  committed
  8aa18d2

  Copy full SHA for 8aa18d2

• fix: 팀 작업 현황 필터링 조회 수정 및 정렬 기능 개선

  nano-mm

  committed
  97ea235

  Copy full SHA for 97ea235

• 충돌 해결: develop 브랜치와 병합

  nano-mm

  committed
  62fde13

  Copy full SHA for 62fde13

• Delete src/main/resources/env.properties

  nano-mm

  authored
  21635ed

  Copy full SHA for 21635ed

• Delete src/test/resources/application.yml

  nano-mm

  authored
  a1e9beb

  Copy full SHA for a1e9beb

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  ee8ffd5

  Copy full SHA for ee8ffd5

• 충돌 해결: develop 브랜치와 병합

  nano-mm

  committed
  4ae0752

  Copy full SHA for 4ae0752

• Update application.yml

  nano-mm

  authored
  21a1a26

  Copy full SHA for 21a1a26

• Revert application.yml files to match develop branch

  nano-mm

  committed
  2be6e45

  Copy full SHA for 2be6e45

• Resolve merge conflicts

  nano-mm

  committed
  ceea328

  Copy full SHA for ceea328

• CLAP-256 fix: Update application.yml

  nano-mm

  authored
  e72b634

  Copy full SHA for e72b634

• CLAP-256 fix: Update application.yml

  nano-mm

  authored
  b8bd148

  Copy full SHA for b8bd148

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  fbfb2a7

  Copy full SHA for fbfb2a7

• Merge branch 'CLAP-256-팀-작업-현황-에러-재수정' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  Show description for 614c1f2
  hyoseong-Choi

  committed
  614c1f2

  Copy full SHA for 614c1f2

• CLAP-256 Fix : 팀 현황 필터조회 기여도순 정렬 수정

  Show description for 473387a
  hyoseong-Choi

  committed
  473387a

  Copy full SHA for 473387a

• CLAP-309 Fix : 엘라스틱서치에 저장할 작업 정보 수정

  Show description for 7f4649b
  hyoseong-Choi

  committed
  7f4649b

  Copy full SHA for 7f4649b

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  5aa1bec

  Copy full SHA for 5aa1bec

• CLAP-309 Fix : 엘라스틱서치에 저장 누락되는것 수정

  Show description for 173aa9b
  hyoseong-Choi

  committed
  173aa9b

  Copy full SHA for 173aa9b

Commits on Feb 7, 2025

• CLAP-test

  parkjaehak

  committed
  d009316

  Copy full SHA for d009316

• Merge branch 'test' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  e6158cc

  Copy full SHA for e6158cc

• CLAP-318 Fix : 2차카테고리 입력 양식(설명 예시) 추가

  Show description for 1ea4568
  hyoseong-Choi

  committed
  1ea4568

  Copy full SHA for 1ea4568

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  ca85227

  Copy full SHA for ca85227

• CLAP-318 Test : 2차카테고리 입력 양식(설명 예시) 추가한 테스트코드 수정

  Show description for cdbdb49
  hyoseong-Choi

  committed
  cdbdb49

  Copy full SHA for cdbdb49

• CLAP-318 Feature : 2차카테고리 단일조회 API

  Show description for af05e86
  hyoseong-Choi

  committed
  af05e86

  Copy full SHA for af05e86

• CLAP-318 Feature : 2차카테고리 경로 수정 원복

  Show description for c10e314
  hyoseong-Choi

  committed
  c10e314

  Copy full SHA for c10e314

• Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

  hyoseong-Choi

  committed
  2858533

  Copy full SHA for 2858533

• CLAP-327 Fix: 팀 현황 필터링 조회 정렬 위치 수정

  Show description for 921bfa3
  hyoseong-Choi

  committed
  921bfa3

  Copy full SHA for 921bfa3