Skip to content

Commit

Permalink
Merge pull request #92 from Donut-DONationUTile/feature/fcm
Browse files Browse the repository at this point in the history
fix: 객체 부재 오류 수정
  • Loading branch information
Ganghee-Lee-0522 authored May 1, 2024
2 parents 2c4a693 + 4fb8e9f commit 9ad43be
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions src/main/java/zero/eight/donut/controller/FcmController.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ public ApiResponse<?> test30() throws FirebaseMessagingException {
}

@GetMapping("/mock/37/{email}")
public ApiResponse<?> mock37(@PathVariable("email") String email, @RequestParam("product") String product) throws FirebaseMessagingException {
public ApiResponse<?> mock37(@PathVariable(name = "email") String email, @RequestParam(name = "product") String product) throws FirebaseMessagingException {
return ApiResponse.success(Success.FCM_TEST_SUCCESS, fcmService.mock37(email, product));
}

@GetMapping("/mock/30/{email}")
public ApiResponse<?> mock30(@PathVariable("email") String email, @RequestParam("product") String product) throws FirebaseMessagingException {
public ApiResponse<?> mock30(@PathVariable(name = "email") String email, @RequestParam(name = "product") String product) throws FirebaseMessagingException {
return ApiResponse.success(Success.FCM_TEST_SUCCESS, fcmService.mock30(email, product));
}

@GetMapping("/mock/7/{email}")
public ApiResponse<?> mock7(@PathVariable("email") String email, @RequestParam("store") String store) throws FirebaseMessagingException {
return ApiResponse.success(Success.FCM_TEST_SUCCESS, fcmService.mock7(email, store));
@GetMapping("/mock/7/{name}")
public ApiResponse<?> mock7(@PathVariable(name = "name") String name, @RequestParam(name = "store") String store) throws FirebaseMessagingException {
return ApiResponse.success(Success.FCM_TEST_SUCCESS, fcmService.mock7(name, store));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ public class HistoryGiverController {
private final AuthService authService;

@GetMapping("/info/{donateDate}")
public ApiResponse<?> getDonationList(@PathVariable("donateDate")LocalDateTime donateDate){
public ApiResponse<?> getDonationList(@PathVariable(name = "donateDate")LocalDateTime donateDate){
return historyGiverService.getDonationList(donateDate);
}

@GetMapping("/info/detail/{giftId}")
public ApiResponse<?> getDonationDetail(@PathVariable("giftId")Long giftId){
public ApiResponse<?> getDonationDetail(@PathVariable(name = "giftId")Long giftId){
return historyGiverService.getDonationDetail(giftId);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ public ApiResponse<?> receiverHome(){
}

@GetMapping("/box/{boxId}")
public ApiResponse<?> receiverGetOneBox(@PathVariable("boxId") Long boxId){
public ApiResponse<?> receiverGetOneBox(@PathVariable(name = "boxId") Long boxId){
return homeReceiverService.receiverGetOneBox(boxId);
}

@GetMapping("/gift/{giftId}")
public ApiResponse<?> receiverGetOneGuft(@PathVariable("giftId") Long giftId){
public ApiResponse<?> receiverGetOneGuft(@PathVariable(name = "giftId") Long giftId){
return homeReceiverService.receiverGetOneGift(giftId);
}
}

0 comments on commit 9ad43be

Please sign in to comment.