feat : 주문 목록 조회 최신화 - [merged]

[halucinor]

In GitLab by @halucinor on Feb 14, 2023, 01:33

Merges feature/getSingleOrderInfo -> develop

작업 내용

• 주문 목록 조회 코드 최신화 및 conflict resolve
• 주문 내역 상세 조회 코드
• 관리자 주문 내역 상세 조회 코드

  주의사항

  @AnTaeWook 의 코드를 최신 develop 브랜치에 merge 하여 conflict를 수정하였습니다.

Issues #14

• [x] 🧹 불필요한 코드는 제거했나요?
• [x] 💭 이슈는 등록했나요?
• [x] 🏷️ 라벨은 등록했나요?
• [x] 💻 git merge를 사용했나요?

[halucinor]

In GitLab by @halucinor on Feb 14, 2023, 01:33

requested review from @haaeee

[halucinor]

In GitLab by @halucinor on Feb 14, 2023, 01:33

marked the checklist item 🧹 불필요한 코드는 제거했나요? as completed

[halucinor]

In GitLab by @halucinor on Feb 14, 2023, 01:33

marked the checklist item 💭 이슈는 등록했나요? as completed

[halucinor]

In GitLab by @halucinor on Feb 14, 2023, 01:33

marked the checklist item 🏷️ 라벨은 등록했나요? as completed

[halucinor]

In GitLab by @halucinor on Feb 14, 2023, 01:33

marked the checklist item 💻 git merge를 사용했나요? as completed

[halucinor]

In GitLab by @haaeee on Feb 14, 2023, 09:31

Commented on src/main/java/com/gabia/bshop/dto/response/OrderInfoSingleResponse.java line 20

체크 스타일이 적용이 안된 것 같은데 포맷팅 해주셨나요?

[halucinor]

In GitLab by @rkdud1108 on Feb 14, 2023, 11:01

Commented on src/main/java/com/gabia/bshop/repository/ItemImageRepository.java line 28

전에 피드백 받은 대로 multi String형식으로 변경 바랍니다.

@Query("""
    select io from ItemOption io
    join fetch io.item
    where io.item.id in (:itemIdList)
    and io.id in (:optionIdList)
    """)

[halucinor]

In GitLab by @rkdud1108 on Feb 14, 2023, 11:03

Commented on src/main/java/com/gabia/bshop/dto/response/OrderInfoSingleResponse.java line 20

record안의 record가 있는 중첩 레코드라 체크스타일이 저렇게 적용되는 걸로 알고 있습니다. 개행하면 정상적으로 적용되는 걸로 보입니다.

[halucinor]

In GitLab by @rkdud1108 on Feb 14, 2023, 11:16

Commented on src/test/java/com/gabia/bshop/integration/service/OrderServiceTest.java line 456

위의 부분들만 들여쓰기가 되어있는데 checkstyle이 제대로 적용된 건가요?

[halucinor]

In GitLab by @halucinor on Feb 14, 2023, 11:58

Commented on src/main/java/com/gabia/bshop/dto/response/OrderInfoSingleResponse.java line 20

수정하고 반영하겠습니다.

[halucinor]

In GitLab by @halucinor on Feb 14, 2023, 11:58

Commented on src/test/java/com/gabia/bshop/integration/service/OrderServiceTest.java line 456

집에서 사용하는 IDE에 checkstyle 코딩컨밴션이 적용되지 않은거 같습니다... ;-; 작업하고 다시 올릴게요

[halucinor]

In GitLab by @haaeee on Feb 14, 2023, 18:02

Commented on src/main/java/com/gabia/bshop/repository/ItemImageRepository.java line 28

changed this line in version 2 of the diff

[halucinor]

In GitLab by @haaeee on Feb 14, 2023, 18:02

Commented on src/test/java/com/gabia/bshop/integration/service/OrderServiceTest.java line 456

changed this line in version 2 of the diff

[halucinor]

In GitLab by @haaeee on Feb 14, 2023, 18:02

added 6 commits

• 49d940e8...e5c5b135 - 2 commits from branch develop
• 3712e7f8 - Merge branch 'develop' into feature/getSingleOrderInfo
• 9f3e4891 - style: multi String 으로 변경
• a318f2a7 - style: checkStyle Formatting
• 0f1785b6 - refactor: MemberPayloadSupport optional 코드로 변경

Compare with previous version

[halucinor]

In GitLab by @haaeee on Feb 14, 2023, 18:03

Commented on src/test/java/com/gabia/bshop/integration/service/OrderServiceTest.java line 456

코드 컨벤션 적용하였습니다!

[halucinor]

In GitLab by @haaeee on Feb 14, 2023, 18:03

Commented on src/main/java/com/gabia/bshop/repository/ItemImageRepository.java line 28

multi String형식으로 변경 하였습니다!

[halucinor]

In GitLab by @haaeee on Feb 14, 2023, 18:03

Commented on src/main/java/com/gabia/bshop/dto/response/OrderInfoSingleResponse.java line 20

제가 수정하고 반영했습니다!!

[halucinor]

In GitLab by @rkdud1108 on Feb 15, 2023, 15:29

resolved all threads

[halucinor]

In GitLab by @rkdud1108 on Feb 15, 2023, 15:29

approved this merge request

[halucinor]

In GitLab by @halucinor on Feb 15, 2023, 15:29

mentioned in commit f1bdc55f684c581e192f4319aeae93c46fd4e281

[halucinor]

In GitLab by @rkdud1108 on Feb 15, 2023, 15:29

mentioned in commit 78e1a0eabbfe65266578a264dc8b96ede006bfc4

[halucinor]

In GitLab by @halucinor on Feb 21, 2023, 12:59

mentioned in commit 9a043ac60e0ac7fde962795a9ff59eaf4f2e8b42

[halucinor]

In GitLab by @haaeee on Mar 7, 2023, 10:00

mentioned in commit 07d25fd7dbcc3ecadd855f90f140b2f2b61d3c1f

[halucinor]

In GitLab by @halucinor on Mar 8, 2023, 17:23

mentioned in commit 2e0e481faed37aba8c40035da5d200b28c6ed1af

[halucinor]

In GitLab by @halucinor on Mar 8, 2023, 22:35

mentioned in commit 9b6efe6bde5fbf30a19e6118d5a5900e2e962383

[halucinor]

In GitLab by @rkdud1108 on Mar 18, 2023, 12:58

mentioned in commit f69407b6bce153198d48f198c33983b58b0e3a85