Skip to content

Commit 757e471

Browse files
authored
refactor:dto에 id추가, userId 타입 Long으로변경 (#13)
* refactor:dto에 id추가, userId 타입 Long으로변경 * refactor: cursorId도 Long으로 변경
1 parent 8114fec commit 757e471

File tree

7 files changed

+22
-24
lines changed

7 files changed

+22
-24
lines changed

src/main/java/com/devpath/domain/user/contorller/UserController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class UserController implements UserControllerDocs {
3131
* @return ApiResponse<MyCardRes>
3232
*/
3333
@GetMapping("/{user-Id}")
34-
public ApiResponse<MyCardRes> getCard(@PathVariable("user-Id") String userId) {
34+
public ApiResponse<MyCardRes> getCard(@PathVariable("user-Id") Long userId) {
3535
return ApiResponse.onSuccess(GeneralSuccessCode._OK, userService.getMyCardRes(userId));
3636
}
3737

@@ -46,8 +46,8 @@ public ApiResponse<MyCardRes> getCard(@PathVariable("user-Id") String userId) {
4646
*/
4747
@Override
4848
@GetMapping("/cards")
49-
public ApiResponse<CursorResponseDto<CardPrevRes>> getCards(@RequestHeader String userId,
50-
@RequestParam(required = false) String cursor,
49+
public ApiResponse<CursorResponseDto<CardPrevRes>> getCards(@RequestHeader Long userId,
50+
@RequestParam(required = false) Long cursor,
5151
@RequestParam(required = false, defaultValue = "10") Integer size,
5252
@RequestParam(required = false) JobGroup jobGroup) {
5353
return ApiResponse.onSuccess(GeneralSuccessCode._OK,
@@ -63,7 +63,7 @@ public ApiResponse<CursorResponseDto<CardPrevRes>> getCards(@RequestHeader Strin
6363
*/
6464
@PostMapping("/exchange-card")
6565
@Override
66-
public ResponseEntity<ApiResponse<Void>> exchangeCard(@RequestHeader String userId, @RequestParam String cardCode) {
66+
public ResponseEntity<ApiResponse<Void>> exchangeCard(@RequestHeader Long userId, @RequestParam Long cardCode) {
6767
userService.exchangeCard(userId, cardCode);
6868

6969
return ResponseEntity.status(HttpStatus.CREATED)

src/main/java/com/devpath/domain/user/contorller/UserControllerDocs.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ public interface UserControllerDocs {
2323
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "명함 조회 성공"),
2424
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "COMMON_404: 검색 결과가 없습니다.")
2525
})
26-
ApiResponse<MyCardRes> getCard(String userId);
26+
ApiResponse<MyCardRes> getCard(Long userId);
2727

2828
@Operation(summary = "명함 목록 조회", description = "최신순으로 교환한 명함 목록을 조회합니다. (직군을 선택하여 필터링 가능)")
2929
@ApiResponses({
3030
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "명함 목록 조회 성공"),
3131
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "COMMON_404: 검색 결과가 없습니다.")
3232
})
33-
ApiResponse<CursorResponseDto<CardPrevRes>> getCards(String userId, String cursor, Integer size,
33+
ApiResponse<CursorResponseDto<CardPrevRes>> getCards(Long userId, Long cursor, Integer size,
3434
JobGroup jobGroup);
3535

3636
@Operation(summary = "명함 교환", description = "명함 코드를 입력하면 명함이 교환됩니다.")
@@ -39,7 +39,7 @@ ApiResponse<CursorResponseDto<CardPrevRes>> getCards(String userId, String curso
3939
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "FOLLOW_400: 이미 추가한 명함입니다"),
4040
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "COMMON_404: 검색 결과가 없습니다.")
4141
})
42-
ResponseEntity<ApiResponse<Void>> exchangeCard(String userId, String cardCode);
42+
ResponseEntity<ApiResponse<Void>> exchangeCard(Long userId, Long cardCode);
4343

4444
@Operation(summary = "프로필 작성", description = "사용자의 프로필 정보를 작성합니다. 모든 필드는 필수이며, 기술 스택은 최소 1개 이상 선택해야 합니다.")
4545
@ApiResponses({

src/main/java/com/devpath/domain/user/converter/UserConverter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public static MyCardRes toMyCardRes(User user) {
1717

1818
public static CardPrevRes toCardPrevRes(User user) {
1919
return CardPrevRes.builder()
20+
.userId(user.getId())
2021
.profileImg(user.getProfileImageUrl())
2122
.jobGroup(user.getJobGroup().toString())
2223
.build();

src/main/java/com/devpath/domain/user/dto/CardPrevRes.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
@Builder
77
@Getter
88
public class CardPrevRes {
9+
private Long userId;
910
private String profileImg;
1011
private String nickName;
1112
private String jobGroup;

src/main/java/com/devpath/domain/user/repository/FollowRepository.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.devpath.domain.user.repository;
22

33
import com.devpath.domain.user.entity.Follow;
4+
import com.devpath.domain.user.entity.User;
45
import com.devpath.domain.user.enums.JobGroup;
56
import org.springframework.data.domain.Pageable;
67
import org.springframework.data.domain.Slice;
@@ -20,4 +21,5 @@ public interface FollowRepository extends JpaRepository<Follow, Long> {
2021

2122
boolean existsByUser_IdAndFollower_Id(Long userId, Long followerId);
2223

24+
Long user(User user);
2325
}

src/main/java/com/devpath/domain/user/service/UserService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public interface UserService {
1515
* @param userId 조회할 사용자의 ID (PK)
1616
* @return 본인 명함 정보가 담긴 DTO (MyCardRes)
1717
*/
18-
MyCardRes getMyCardRes(String userId);
18+
MyCardRes getMyCardRes(Long userId);
1919

2020
/**
2121
* 사용자가 보유한 명함(팔로우) 목록을 커서 기반 페이징으로 조회합니다.
@@ -27,7 +27,7 @@ public interface UserService {
2727
* @param jobGroup 필터링할 직군 (전체 조회 시 null)
2828
* @return 다음 커서 정보와 명함 목록이 담긴 DTO
2929
*/
30-
CursorResponseDto<CardPrevRes> getCardPrevRes(String userId, String cursor, Integer size, JobGroup jobGroup);
30+
CursorResponseDto<CardPrevRes> getCardPrevRes(Long userId, Long cursor, Integer size, JobGroup jobGroup);
3131

3232
/**
3333
* 다른 사용자와 명함을 교환합니다.
@@ -36,7 +36,7 @@ public interface UserService {
3636
* @param userId 요청하는 사용자 ID
3737
* @param cardCode 교환할 상대방의 명함 코드 (User ID)
3838
*/
39-
void exchangeCard(String userId, String cardCode);
39+
void exchangeCard(Long userId, Long cardCode);
4040

4141
/**
4242
* 새로운 사용자 프로필을 생성합니다.

src/main/java/com/devpath/domain/user/service/UserServiceImpl.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,18 @@ public User createProfile(UserProfileRequest request) {
4646

4747
@Override
4848
@Transactional(readOnly = true)
49-
public MyCardRes getMyCardRes(String userId) {
50-
Long uid = Long.valueOf(userId);
51-
return UserConverter.toMyCardRes(checkUser(uid));
49+
public MyCardRes getMyCardRes(Long userId) {
50+
return UserConverter.toMyCardRes(checkUser(userId));
5251
}
5352

5453
@Override
5554
@Transactional(readOnly = true)
56-
public CursorResponseDto<CardPrevRes> getCardPrevRes(String userId, String cursor, Integer size,
55+
public CursorResponseDto<CardPrevRes> getCardPrevRes(Long userId, Long cursor, Integer size,
5756
JobGroup jobGroup) {
5857

59-
Long uid = Long.valueOf(userId);
60-
Long cursorId = cursor != null ? Long.valueOf(cursor) : null;
61-
6258
Pageable pageable = PageRequest.of(0, size, Sort.by(Sort.Direction.DESC, "id"));
6359

64-
Slice<Follow> followSlice = followRepository.findNextByCursor(uid, cursorId, jobGroup, pageable);
60+
Slice<Follow> followSlice = followRepository.findNextByCursor(userId, cursor, jobGroup, pageable);
6561

6662
Slice<CardPrevRes> result = followSlice.map(f -> UserConverter.toCardPrevRes(f.getFollower()));
6763

@@ -73,14 +69,12 @@ public CursorResponseDto<CardPrevRes> getCardPrevRes(String userId, String curso
7369
}
7470

7571
@Transactional
76-
public void exchangeCard(String userId, String cardCode) {
77-
Long uid = Long.valueOf(userId);
78-
Long fid = Long.valueOf(cardCode);
72+
public void exchangeCard(Long userId, Long cardCode) {
7973

80-
User user = checkUser(uid);
81-
User friend = checkUser(fid);
74+
User user = checkUser(userId);
75+
User friend = checkUser(cardCode);
8276

83-
if (followRepository.existsByUser_IdAndFollower_Id(uid, fid)) {
77+
if (followRepository.existsByUser_IdAndFollower_Id(userId, cardCode)) {
8478
throw new GlobalHandler(GeneralErrorCode.FOLLOW_ALREADY_EXISTED);
8579
}
8680

0 commit comments

Comments
 (0)