Skip to content

Commit a5b1e03

Browse files
committed
fix: 사용하지 않는 메서드 삭제
1 parent 028990f commit a5b1e03

File tree

4 files changed

+12
-33
lines changed

4 files changed

+12
-33
lines changed

src/main/java/cmf/commitField/domain/commit/scheduler/CommitUpdateService.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,4 @@ public UserInfoDto updateUserTier(String username){
3939
.tier(user.getTier().name())
4040
.build();
4141
}
42-
43-
public User updateUserPet(String username){
44-
User user = userRepository.findByUsername(username).get();
45-
46-
//추가된 펫 경험치
47-
long totalcommits;
48-
totalcommits = totalCommitService.getUpdateCommits(user.getUsername(), user.getCreatedAt(), LocalDateTime.now()).getTotalCommitContributions();
49-
50-
petService.getExpPet(user, (int)totalcommits);
51-
return user;
52-
}
5342
}

src/main/java/cmf/commitField/domain/pet/controller/PetController.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import cmf.commitField.domain.pet.dto.UserPetDto;
44
import cmf.commitField.domain.pet.entity.Pet;
55
import cmf.commitField.domain.pet.service.PetService;
6-
import cmf.commitField.domain.user.dto.UserInfoDto;
76
import cmf.commitField.domain.user.entity.CustomOAuth2User;
87
import cmf.commitField.domain.user.entity.User;
98
import cmf.commitField.domain.user.service.CustomOAuth2UserService;
@@ -29,7 +28,7 @@ public ResponseEntity<UserPetDto> getUserTier(@AuthenticationPrincipal CustomOAu
2928
String username = oAuth2User.getName(); // CustomOAuth2User의 getName()은 user.getUsername()을 반환
3029

3130
System.out.println("/pet/exp, Username: "+username);
32-
UserPetDto userPetDto = petService.getExpPet(username);
31+
UserPetDto userPetDto = petService.getExpPet(username, 0);
3332
return ResponseEntity.ok(userPetDto);
3433
}
3534

@@ -67,7 +66,7 @@ public void deletePet(@PathVariable Long petId) {
6766
}
6867

6968
public void getExpPet(User user, int commitCount){
70-
petService.getExpPet(user, commitCount);
69+
petService.getExpPet(user.getUsername(), commitCount);
7170

7271
}
7372
}

src/main/java/cmf/commitField/domain/pet/controller/UserPetController.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
package cmf.commitField.domain.pet.controller;
22

33

4-
import cmf.commitField.domain.pet.dto.UserPetDto;
54
import cmf.commitField.domain.pet.entity.Pet;
65
import cmf.commitField.domain.pet.service.PetService;
76
import cmf.commitField.domain.pet.service.UserPetService;
87
import cmf.commitField.domain.user.entity.User;
98
import cmf.commitField.domain.user.service.CustomOAuth2UserService;
109
import cmf.commitField.global.globalDto.GlobalResponse;
1110
import lombok.RequiredArgsConstructor;
12-
import org.springframework.web.bind.annotation.*;
11+
import org.springframework.web.bind.annotation.GetMapping;
12+
import org.springframework.web.bind.annotation.PathVariable;
13+
import org.springframework.web.bind.annotation.RequestMapping;
14+
import org.springframework.web.bind.annotation.RestController;
1315

1416
import java.util.List;
1517

@@ -22,15 +24,7 @@ public class UserPetController {
2224
private final CustomOAuth2UserService customOAuth2UserService;
2325
private final PetService petService;
2426

25-
// 유저가 펫을 부화
26-
@PostMapping("/hatch")
27-
public GlobalResponse<UserPetDto> hatchPet(@RequestParam Long userId, @RequestParam Long petId) {
28-
User user = customOAuth2UserService.getUserById(userId).orElse(null);
29-
Pet pet = petService.getPetById(petId);
30-
UserPetDto userPetDto = new UserPetDto(userPetService.hatchPet(user, pet));
31-
return GlobalResponse.success(userPetDto);
32-
}
33-
27+
// TODO: 기능 확장시 추가 예정
3428
// 유저의 도감 조회 (보유한 펫 목록)
3529
@GetMapping("/collection/{userId}")
3630
public GlobalResponse<List<Pet>> getUserPetCollection(@PathVariable Long userId) {
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
package cmf.commitField.domain.pet.dto;
22

3-
import cmf.commitField.domain.pet.entity.UserPet;
3+
import lombok.AllArgsConstructor;
44
import lombok.Builder;
55
import lombok.Getter;
6+
import lombok.NoArgsConstructor;
67

78
@Builder
89
@Getter
10+
@NoArgsConstructor
11+
@AllArgsConstructor
912
public class UserPetDto {
1013
private String username;
11-
private Long petId;
14+
private long petId;
1215
private String petName;
1316
private String grow;
1417
private long exp;
15-
16-
public UserPetDto(UserPet userPet) {
17-
this.username = userPet.getUser().getUsername();
18-
this.petId = userPet.getPet().getId();
19-
this.petName = userPet.getPet().getName();
20-
}
2118
}

0 commit comments

Comments
 (0)