Skip to content

Commit d2bb9c2

Browse files
authored
Merge pull request #142 from prgrms-web-devcourse-final-project/chore#137
[chore] 개발 환경 ddl-auto 설정 바꾸고 다시 테스트#137
2 parents 8709b1f + 484c733 commit d2bb9c2

File tree

16 files changed

+65
-73
lines changed

16 files changed

+65
-73
lines changed

src/main/java/com/back/domain/chatbot/controller/ChatbotController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.List;
1515

1616
@RestController
17-
@RequestMapping("/api/chatbot")
17+
@RequestMapping("/chatbot")
1818
@RequiredArgsConstructor
1919
@Slf4j
2020
public class ChatbotController {

src/main/java/com/back/domain/cocktail/comment/controller/CocktailCommentController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.List;
1515

1616
@RestController
17-
@RequestMapping("/api/cocktails/{cocktailId}/comments")
17+
@RequestMapping("/cocktails/{cocktailId}/comments")
1818
@Tag(name = "ApiCocktailCommentController", description = "API 칵테일댓글 컨트롤러")
1919
@RequiredArgsConstructor
2020
public class CocktailCommentController {

src/main/java/com/back/domain/cocktail/controller/CocktailController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java.util.List;
1616

1717
@RestController
18-
@RequestMapping("api/cocktails")
18+
@RequestMapping("cocktails")
1919
@Tag(name = "ApiCocktailController", description = "API 칵테일 컨트롤러")
2020
@RequiredArgsConstructor
2121
public class CocktailController {

src/main/java/com/back/domain/cocktail/controller/CocktailShareController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.util.Map;
1414

1515
@RestController
16-
@RequestMapping("/api/cocktails")
16+
@RequestMapping("/cocktails")
1717
@RequiredArgsConstructor
1818
public class CocktailShareController {
1919
private final CocktailRepository cocktailRepository;

src/main/java/com/back/domain/mybar/controller/MyBarController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.time.LocalDateTime;
1515

1616
@RestController
17-
@RequestMapping("/api/me/bar")
17+
@RequestMapping("/me/bar")
1818
@RequiredArgsConstructor
1919
@Validated
2020
public class MyBarController {

src/main/java/com/back/domain/myhistory/controller/MyHistoryController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.time.LocalDateTime;
1919

2020
@RestController
21-
@RequestMapping("/api/me")
21+
@RequestMapping("/me")
2222
@RequiredArgsConstructor
2323
@Validated
2424
public class MyHistoryController {

src/main/java/com/back/domain/myhistory/service/MyHistoryService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public MyHistoryCommentGoResponseDto getPostLinkFromMyComment(Long userId, Long
102102
throw new ServiceException(410, "삭제된 게시글입니다.");
103103
}
104104
Long postId = post.getId();
105-
String apiUrl = "/api/posts/" + postId;
105+
String apiUrl = "/posts/" + postId;
106106
return new MyHistoryCommentGoResponseDto(postId, apiUrl);
107107
}
108108

@@ -116,7 +116,7 @@ public MyHistoryPostGoResponseDto getPostLinkFromMyPost(Long userId, Long postId
116116
if (p.getStatus() == PostStatus.DELETED) {
117117
throw new ServiceException(410, "삭제된 게시글입니다.");
118118
}
119-
String apiUrl = "/api/posts/" + p.getId();
119+
String apiUrl = "/posts/" + p.getId();
120120
return new MyHistoryPostGoResponseDto(p.getId(), apiUrl);
121121
}
122122

@@ -177,7 +177,7 @@ public MyHistoryPostGoResponseDto getPostLinkFromMyLikedPost(Long userId, Long p
177177
if (post.getStatus() == PostStatus.DELETED) {
178178
throw new ServiceException(410, "삭제된 게시글입니다.");
179179
}
180-
String apiUrl = "/api/posts/" + post.getId();
180+
String apiUrl = "/posts/" + post.getId();
181181
return new MyHistoryPostGoResponseDto(post.getId(), apiUrl);
182182
}
183183
}

src/main/java/com/back/domain/notification/controller/NotificationController.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,21 @@
77
import com.back.domain.notification.service.NotificationService;
88
import com.back.domain.notification.service.NotificationSettingService;
99
import com.back.global.rsData.RsData;
10+
import io.swagger.v3.oas.annotations.Operation;
1011
import jakarta.validation.Valid;
1112
import jakarta.validation.constraints.Max;
1213
import jakarta.validation.constraints.Min;
13-
import io.swagger.v3.oas.annotations.Operation;
14-
import java.time.LocalDateTime;
1514
import lombok.RequiredArgsConstructor;
1615
import org.springframework.format.annotation.DateTimeFormat;
1716
import org.springframework.security.core.annotation.AuthenticationPrincipal;
1817
import org.springframework.validation.annotation.Validated;
19-
import org.springframework.web.bind.annotation.GetMapping;
20-
import org.springframework.web.bind.annotation.PatchMapping;
21-
import org.springframework.web.bind.annotation.PathVariable;
22-
import org.springframework.web.bind.annotation.PostMapping;
23-
import org.springframework.web.bind.annotation.RequestBody;
24-
import org.springframework.web.bind.annotation.RequestMapping;
25-
import org.springframework.web.bind.annotation.RequestParam;
26-
import org.springframework.web.bind.annotation.RestController;
18+
import org.springframework.web.bind.annotation.*;
2719
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
2820

21+
import java.time.LocalDateTime;
22+
2923
@RestController
30-
@RequestMapping("/api/me")
24+
@RequestMapping("/me")
3125
@RequiredArgsConstructor
3226
@Validated
3327
public class NotificationController {

src/main/java/com/back/domain/notification/service/NotificationService.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@
1010
import com.back.domain.user.entity.User;
1111
import com.back.global.exception.ServiceException;
1212
import com.back.global.rq.Rq;
13-
import java.time.LocalDateTime;
14-
import java.util.ArrayList;
15-
import java.util.List;
16-
import java.util.Map;
17-
import java.util.concurrent.ConcurrentHashMap;
1813
import lombok.RequiredArgsConstructor;
1914
import org.springframework.data.domain.PageRequest;
2015
import org.springframework.stereotype.Service;
2116
import org.springframework.transaction.annotation.Transactional;
2217
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
2318

19+
import java.time.LocalDateTime;
20+
import java.util.ArrayList;
21+
import java.util.List;
22+
import java.util.Map;
23+
import java.util.concurrent.ConcurrentHashMap;
24+
2425
@Service
2526
@RequiredArgsConstructor
2627
public class NotificationService {
@@ -85,7 +86,7 @@ public NotificationGoResponseDto markAsReadAndGetPostLink(Long userId, Long noti
8586
notification.markRead();
8687
}
8788
Long postId = notification.getPost().getId();
88-
String apiUrl = "/api/posts/" + postId;
89+
String apiUrl = "/posts/" + postId;
8990
return new NotificationGoResponseDto(postId, apiUrl);
9091
}
9192

src/main/java/com/back/domain/post/comment/controller/CommentController.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,13 @@
88
import io.swagger.v3.oas.annotations.Operation;
99
import io.swagger.v3.oas.annotations.tags.Tag;
1010
import jakarta.validation.Valid;
11-
import java.util.List;
1211
import lombok.RequiredArgsConstructor;
13-
import org.springframework.web.bind.annotation.DeleteMapping;
14-
import org.springframework.web.bind.annotation.GetMapping;
15-
import org.springframework.web.bind.annotation.PatchMapping;
16-
import org.springframework.web.bind.annotation.PathVariable;
17-
import org.springframework.web.bind.annotation.PostMapping;
18-
import org.springframework.web.bind.annotation.RequestBody;
19-
import org.springframework.web.bind.annotation.RequestMapping;
20-
import org.springframework.web.bind.annotation.RequestParam;
21-
import org.springframework.web.bind.annotation.RestController;
12+
import org.springframework.web.bind.annotation.*;
13+
14+
import java.util.List;
2215

2316
@RestController
24-
@RequestMapping("/api/posts/{postId}/comments")
17+
@RequestMapping("/posts/{postId}/comments")
2518
@Tag(name = "ApiCommentController", description = "API 댓글 컨트롤러")
2619
@RequiredArgsConstructor
2720
public class CommentController {

0 commit comments

Comments
 (0)