diff --git a/src/main/java/freshtrash/freshtrashbackend/controller/AlarmApi.java b/src/main/java/freshtrash/freshtrashbackend/controller/AlarmController.java similarity index 98% rename from src/main/java/freshtrash/freshtrashbackend/controller/AlarmApi.java rename to src/main/java/freshtrash/freshtrashbackend/controller/AlarmController.java index d688be9d..aa65e08c 100644 --- a/src/main/java/freshtrash/freshtrashbackend/controller/AlarmApi.java +++ b/src/main/java/freshtrash/freshtrashbackend/controller/AlarmController.java @@ -15,7 +15,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/notis") -public class AlarmApi { +public class AlarmController { private final AlarmService alarmService; /** diff --git a/src/main/java/freshtrash/freshtrashbackend/controller/AuctionApi.java b/src/main/java/freshtrash/freshtrashbackend/controller/AuctionController.java similarity index 99% rename from src/main/java/freshtrash/freshtrashbackend/controller/AuctionApi.java rename to src/main/java/freshtrash/freshtrashbackend/controller/AuctionController.java index 3159a593..36dac424 100644 --- a/src/main/java/freshtrash/freshtrashbackend/controller/AuctionApi.java +++ b/src/main/java/freshtrash/freshtrashbackend/controller/AuctionController.java @@ -28,7 +28,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/auctions") -public class AuctionApi { +public class AuctionController { private final AuctionService auctionService; private final AuctionEventService auctionEventService; private final BiddingHistoryService biddingHistoryService; diff --git a/src/main/java/freshtrash/freshtrashbackend/controller/AuctionReviewApi.java b/src/main/java/freshtrash/freshtrashbackend/controller/AuctionReviewController.java similarity index 97% rename from src/main/java/freshtrash/freshtrashbackend/controller/AuctionReviewApi.java rename to src/main/java/freshtrash/freshtrashbackend/controller/AuctionReviewController.java index 3f9f2486..83daf1d6 100644 --- a/src/main/java/freshtrash/freshtrashbackend/controller/AuctionReviewApi.java +++ b/src/main/java/freshtrash/freshtrashbackend/controller/AuctionReviewController.java @@ -15,7 +15,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/auctions") -public class AuctionReviewApi { +public class AuctionReviewController { private final AuctionReviewService auctionReviewService; /** diff --git a/src/main/java/freshtrash/freshtrashbackend/controller/AuthApi.java b/src/main/java/freshtrash/freshtrashbackend/controller/AuthController.java similarity index 98% rename from src/main/java/freshtrash/freshtrashbackend/controller/AuthApi.java rename to src/main/java/freshtrash/freshtrashbackend/controller/AuthController.java index 40e86d0a..c91d78ec 100644 --- a/src/main/java/freshtrash/freshtrashbackend/controller/AuthApi.java +++ b/src/main/java/freshtrash/freshtrashbackend/controller/AuthController.java @@ -16,7 +16,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/auth") -public class AuthApi { +public class AuthController { private final MemberService memberService; /** diff --git a/src/main/java/freshtrash/freshtrashbackend/controller/ChatMessageApi.java b/src/main/java/freshtrash/freshtrashbackend/controller/ChatMessageController.java similarity index 97% rename from src/main/java/freshtrash/freshtrashbackend/controller/ChatMessageApi.java rename to src/main/java/freshtrash/freshtrashbackend/controller/ChatMessageController.java index df359f72..b5e14b86 100644 --- a/src/main/java/freshtrash/freshtrashbackend/controller/ChatMessageApi.java +++ b/src/main/java/freshtrash/freshtrashbackend/controller/ChatMessageController.java @@ -11,7 +11,7 @@ @Controller @RequiredArgsConstructor -public class ChatMessageApi { +public class ChatMessageController { private final ChatMessageService chatMessageService; /** diff --git a/src/main/java/freshtrash/freshtrashbackend/controller/ChatRoomApi.java b/src/main/java/freshtrash/freshtrashbackend/controller/ChatRoomController.java similarity index 98% rename from src/main/java/freshtrash/freshtrashbackend/controller/ChatRoomApi.java rename to src/main/java/freshtrash/freshtrashbackend/controller/ChatRoomController.java index c98e6da9..4716fa75 100644 --- a/src/main/java/freshtrash/freshtrashbackend/controller/ChatRoomApi.java +++ b/src/main/java/freshtrash/freshtrashbackend/controller/ChatRoomController.java @@ -16,7 +16,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/chats") -public class ChatRoomApi { +public class ChatRoomController { private final ChatRoomService chatRoomService; @GetMapping diff --git a/src/main/java/freshtrash/freshtrashbackend/controller/ChatRoomEventApi.java b/src/main/java/freshtrash/freshtrashbackend/controller/ChatRoomEventController.java similarity index 98% rename from src/main/java/freshtrash/freshtrashbackend/controller/ChatRoomEventApi.java rename to src/main/java/freshtrash/freshtrashbackend/controller/ChatRoomEventController.java index 6123f7a4..edd100ce 100644 --- a/src/main/java/freshtrash/freshtrashbackend/controller/ChatRoomEventApi.java +++ b/src/main/java/freshtrash/freshtrashbackend/controller/ChatRoomEventController.java @@ -18,7 +18,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/chats") -public class ChatRoomEventApi { +public class ChatRoomEventController { private final ChatRoomService chatRoomService; private final UserFlagChatAlarm userFlagChatAlarm; private final CancelBookingProductAlarm cancelBookingProductAlarm; diff --git a/src/main/java/freshtrash/freshtrashbackend/controller/MailApi.java b/src/main/java/freshtrash/freshtrashbackend/controller/MailController.java similarity index 98% rename from src/main/java/freshtrash/freshtrashbackend/controller/MailApi.java rename to src/main/java/freshtrash/freshtrashbackend/controller/MailController.java index 5f68ebd6..c813ab37 100644 --- a/src/main/java/freshtrash/freshtrashbackend/controller/MailApi.java +++ b/src/main/java/freshtrash/freshtrashbackend/controller/MailController.java @@ -20,7 +20,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/mail") -public class MailApi { +public class MailController { private final MailService mailService; private final MemberService memberService; diff --git a/src/main/java/freshtrash/freshtrashbackend/controller/MemberApi.java b/src/main/java/freshtrash/freshtrashbackend/controller/MemberController.java similarity index 98% rename from src/main/java/freshtrash/freshtrashbackend/controller/MemberApi.java rename to src/main/java/freshtrash/freshtrashbackend/controller/MemberController.java index 525bbbe5..bb650f7e 100644 --- a/src/main/java/freshtrash/freshtrashbackend/controller/MemberApi.java +++ b/src/main/java/freshtrash/freshtrashbackend/controller/MemberController.java @@ -17,7 +17,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/members") -public class MemberApi { +public class MemberController { private final MemberService memberService; private final FileService fileService; diff --git a/src/main/java/freshtrash/freshtrashbackend/controller/ProductApi.java b/src/main/java/freshtrash/freshtrashbackend/controller/ProductController.java similarity index 99% rename from src/main/java/freshtrash/freshtrashbackend/controller/ProductApi.java rename to src/main/java/freshtrash/freshtrashbackend/controller/ProductController.java index ea9f8e42..42869cb9 100644 --- a/src/main/java/freshtrash/freshtrashbackend/controller/ProductApi.java +++ b/src/main/java/freshtrash/freshtrashbackend/controller/ProductController.java @@ -29,7 +29,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/products") -public class ProductApi { +public class ProductController { private final ProductService productService; private final FileService fileService; private final ChatRoomService chatRoomService; diff --git a/src/main/java/freshtrash/freshtrashbackend/controller/ProductDealApi.java b/src/main/java/freshtrash/freshtrashbackend/controller/ProductDealController.java similarity index 97% rename from src/main/java/freshtrash/freshtrashbackend/controller/ProductDealApi.java rename to src/main/java/freshtrash/freshtrashbackend/controller/ProductDealController.java index ca3509d2..d9b0526e 100644 --- a/src/main/java/freshtrash/freshtrashbackend/controller/ProductDealApi.java +++ b/src/main/java/freshtrash/freshtrashbackend/controller/ProductDealController.java @@ -22,7 +22,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/productDeals") -public class ProductDealApi { +public class ProductDealController { private final ProductDealService productDealService; @GetMapping diff --git a/src/main/java/freshtrash/freshtrashbackend/controller/ProductLikeApi.java b/src/main/java/freshtrash/freshtrashbackend/controller/ProductLikeController.java similarity index 98% rename from src/main/java/freshtrash/freshtrashbackend/controller/ProductLikeApi.java rename to src/main/java/freshtrash/freshtrashbackend/controller/ProductLikeController.java index d89a6df1..36d4e83b 100644 --- a/src/main/java/freshtrash/freshtrashbackend/controller/ProductLikeApi.java +++ b/src/main/java/freshtrash/freshtrashbackend/controller/ProductLikeController.java @@ -23,7 +23,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/products") -public class ProductLikeApi { +public class ProductLikeController { private final ProductLikeService productLikeService; @GetMapping("/likes") diff --git a/src/main/java/freshtrash/freshtrashbackend/controller/ProductReviewApi.java b/src/main/java/freshtrash/freshtrashbackend/controller/ProductReviewController.java similarity index 97% rename from src/main/java/freshtrash/freshtrashbackend/controller/ProductReviewApi.java rename to src/main/java/freshtrash/freshtrashbackend/controller/ProductReviewController.java index 8750ea75..6523616e 100644 --- a/src/main/java/freshtrash/freshtrashbackend/controller/ProductReviewApi.java +++ b/src/main/java/freshtrash/freshtrashbackend/controller/ProductReviewController.java @@ -15,7 +15,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/products") -public class ProductReviewApi { +public class ProductReviewController { private final ProductReviewService productReviewService; /** diff --git a/src/test/java/freshtrash/freshtrashbackend/controller/AlarmApiTest.java b/src/test/java/freshtrash/freshtrashbackend/controller/AlarmControllerTest.java similarity index 98% rename from src/test/java/freshtrash/freshtrashbackend/controller/AlarmApiTest.java rename to src/test/java/freshtrash/freshtrashbackend/controller/AlarmControllerTest.java index f6a61b76..7c5c1512 100644 --- a/src/test/java/freshtrash/freshtrashbackend/controller/AlarmApiTest.java +++ b/src/test/java/freshtrash/freshtrashbackend/controller/AlarmControllerTest.java @@ -31,9 +31,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@WebMvcTest(AlarmApi.class) +@WebMvcTest(AlarmController.class) @Import(TestSecurityConfig.class) -class AlarmApiTest { +class AlarmControllerTest { @Autowired private MockMvc mvc; diff --git a/src/test/java/freshtrash/freshtrashbackend/controller/AuctionApiTest.java b/src/test/java/freshtrash/freshtrashbackend/controller/AuctionControllerTest.java similarity index 99% rename from src/test/java/freshtrash/freshtrashbackend/controller/AuctionApiTest.java rename to src/test/java/freshtrash/freshtrashbackend/controller/AuctionControllerTest.java index 65b55b78..5524c11b 100644 --- a/src/test/java/freshtrash/freshtrashbackend/controller/AuctionApiTest.java +++ b/src/test/java/freshtrash/freshtrashbackend/controller/AuctionControllerTest.java @@ -43,9 +43,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @ActiveProfiles("test") -@WebMvcTest(AuctionApi.class) +@WebMvcTest(AuctionController.class) @Import(TestSecurityConfig.class) -class AuctionApiTest { +class AuctionControllerTest { @Autowired private MockMvc mvc; diff --git a/src/test/java/freshtrash/freshtrashbackend/controller/AuctionReviewApiTest.java b/src/test/java/freshtrash/freshtrashbackend/controller/AuctionReviewControllerTest.java similarity index 97% rename from src/test/java/freshtrash/freshtrashbackend/controller/AuctionReviewApiTest.java rename to src/test/java/freshtrash/freshtrashbackend/controller/AuctionReviewControllerTest.java index 7b95e5db..be99aace 100644 --- a/src/test/java/freshtrash/freshtrashbackend/controller/AuctionReviewApiTest.java +++ b/src/test/java/freshtrash/freshtrashbackend/controller/AuctionReviewControllerTest.java @@ -24,9 +24,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @ActiveProfiles("test") -@WebMvcTest(AuctionReviewApi.class) +@WebMvcTest(AuctionReviewController.class) @Import(TestSecurityConfig.class) -class AuctionReviewApiTest { +class AuctionReviewControllerTest { @Autowired private MockMvc mvc; diff --git a/src/test/java/freshtrash/freshtrashbackend/controller/AuthApiTest.java b/src/test/java/freshtrash/freshtrashbackend/controller/AuthControllerTest.java similarity index 98% rename from src/test/java/freshtrash/freshtrashbackend/controller/AuthApiTest.java rename to src/test/java/freshtrash/freshtrashbackend/controller/AuthControllerTest.java index 8d2cdc8f..573098f9 100644 --- a/src/test/java/freshtrash/freshtrashbackend/controller/AuthApiTest.java +++ b/src/test/java/freshtrash/freshtrashbackend/controller/AuthControllerTest.java @@ -26,9 +26,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @ActiveProfiles("test") -@WebMvcTest(AuthApi.class) +@WebMvcTest(AuthController.class) @Import(TestSecurityConfig.class) -class AuthApiTest { +class AuthControllerTest { @Autowired private MockMvc mvc; diff --git a/src/test/java/freshtrash/freshtrashbackend/controller/ChatRoomApiTest.java b/src/test/java/freshtrash/freshtrashbackend/controller/ChatRoomControllerTest.java similarity index 98% rename from src/test/java/freshtrash/freshtrashbackend/controller/ChatRoomApiTest.java rename to src/test/java/freshtrash/freshtrashbackend/controller/ChatRoomControllerTest.java index 66183d36..5b6b85a0 100644 --- a/src/test/java/freshtrash/freshtrashbackend/controller/ChatRoomApiTest.java +++ b/src/test/java/freshtrash/freshtrashbackend/controller/ChatRoomControllerTest.java @@ -30,9 +30,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @ActiveProfiles("test") -@WebMvcTest(ChatRoomApi.class) +@WebMvcTest(ChatRoomController.class) @Import(TestSecurityConfig.class) -class ChatRoomApiTest { +class ChatRoomControllerTest { @Autowired private MockMvc mvc; diff --git a/src/test/java/freshtrash/freshtrashbackend/controller/ChatRoomEventApiTest.java b/src/test/java/freshtrash/freshtrashbackend/controller/ChatRoomEventControllerTest.java similarity index 98% rename from src/test/java/freshtrash/freshtrashbackend/controller/ChatRoomEventApiTest.java rename to src/test/java/freshtrash/freshtrashbackend/controller/ChatRoomEventControllerTest.java index ef5a91af..3fd90103 100644 --- a/src/test/java/freshtrash/freshtrashbackend/controller/ChatRoomEventApiTest.java +++ b/src/test/java/freshtrash/freshtrashbackend/controller/ChatRoomEventControllerTest.java @@ -31,9 +31,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @ActiveProfiles("test") -@WebMvcTest(ChatRoomEventApi.class) +@WebMvcTest(ChatRoomEventController.class) @Import(TestSecurityConfig.class) -class ChatRoomEventApiTest { +class ChatRoomEventControllerTest { @Autowired private MockMvc mvc; diff --git a/src/test/java/freshtrash/freshtrashbackend/controller/MailApiTest.java b/src/test/java/freshtrash/freshtrashbackend/controller/MailControllerTest.java similarity index 98% rename from src/test/java/freshtrash/freshtrashbackend/controller/MailApiTest.java rename to src/test/java/freshtrash/freshtrashbackend/controller/MailControllerTest.java index e11729a6..e608ba5c 100644 --- a/src/test/java/freshtrash/freshtrashbackend/controller/MailApiTest.java +++ b/src/test/java/freshtrash/freshtrashbackend/controller/MailControllerTest.java @@ -23,9 +23,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @ActiveProfiles("test") -@WebMvcTest(MailApi.class) +@WebMvcTest(MailController.class) @Import(TestSecurityConfig.class) -class MailApiTest { +class MailControllerTest { @Autowired private MockMvc mvc; diff --git a/src/test/java/freshtrash/freshtrashbackend/controller/MemberApiTest.java b/src/test/java/freshtrash/freshtrashbackend/controller/MemberControllerTest.java similarity index 99% rename from src/test/java/freshtrash/freshtrashbackend/controller/MemberApiTest.java rename to src/test/java/freshtrash/freshtrashbackend/controller/MemberControllerTest.java index 5183d30f..55589be8 100644 --- a/src/test/java/freshtrash/freshtrashbackend/controller/MemberApiTest.java +++ b/src/test/java/freshtrash/freshtrashbackend/controller/MemberControllerTest.java @@ -31,9 +31,9 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; -@WebMvcTest(MemberApi.class) +@WebMvcTest(MemberController.class) @Import(TestSecurityConfig.class) -class MemberApiTest { +class MemberControllerTest { @Autowired private MockMvc mvc; diff --git a/src/test/java/freshtrash/freshtrashbackend/controller/ProductApiTest.java b/src/test/java/freshtrash/freshtrashbackend/controller/ProductControllerTest.java similarity index 99% rename from src/test/java/freshtrash/freshtrashbackend/controller/ProductApiTest.java rename to src/test/java/freshtrash/freshtrashbackend/controller/ProductControllerTest.java index a781d56a..58c8df77 100644 --- a/src/test/java/freshtrash/freshtrashbackend/controller/ProductApiTest.java +++ b/src/test/java/freshtrash/freshtrashbackend/controller/ProductControllerTest.java @@ -48,9 +48,9 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; -@WebMvcTest(ProductApi.class) +@WebMvcTest(ProductController.class) @Import(TestSecurityConfig.class) -class ProductApiTest { +class ProductControllerTest { @Autowired private MockMvc mvc; diff --git a/src/test/java/freshtrash/freshtrashbackend/controller/ProductDealApiTest.java b/src/test/java/freshtrash/freshtrashbackend/controller/ProductDealControllerTest.java similarity index 97% rename from src/test/java/freshtrash/freshtrashbackend/controller/ProductDealApiTest.java rename to src/test/java/freshtrash/freshtrashbackend/controller/ProductDealControllerTest.java index 175afc1d..7afb77b6 100644 --- a/src/test/java/freshtrash/freshtrashbackend/controller/ProductDealApiTest.java +++ b/src/test/java/freshtrash/freshtrashbackend/controller/ProductDealControllerTest.java @@ -31,8 +31,8 @@ @ActiveProfiles("test") @Import(TestSecurityConfig.class) -@WebMvcTest(ProductDealApi.class) -class ProductDealApiTest { +@WebMvcTest(ProductDealController.class) +class ProductDealControllerTest { @Autowired private MockMvc mvc; diff --git a/src/test/java/freshtrash/freshtrashbackend/controller/ProductLikeApiTest.java b/src/test/java/freshtrash/freshtrashbackend/controller/ProductLikeControllerTest.java similarity index 98% rename from src/test/java/freshtrash/freshtrashbackend/controller/ProductLikeApiTest.java rename to src/test/java/freshtrash/freshtrashbackend/controller/ProductLikeControllerTest.java index bb515079..291e213f 100644 --- a/src/test/java/freshtrash/freshtrashbackend/controller/ProductLikeApiTest.java +++ b/src/test/java/freshtrash/freshtrashbackend/controller/ProductLikeControllerTest.java @@ -36,9 +36,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @ActiveProfiles("test") -@WebMvcTest(ProductLikeApi.class) +@WebMvcTest(ProductLikeController.class) @Import(TestSecurityConfig.class) -class ProductLikeApiTest { +class ProductLikeControllerTest { @Autowired private MockMvc mvc; diff --git a/src/test/java/freshtrash/freshtrashbackend/controller/ProductReviewApiTest.java b/src/test/java/freshtrash/freshtrashbackend/controller/ProductReviewControllerTest.java similarity index 97% rename from src/test/java/freshtrash/freshtrashbackend/controller/ProductReviewApiTest.java rename to src/test/java/freshtrash/freshtrashbackend/controller/ProductReviewControllerTest.java index b5484c8c..ca9c2842 100644 --- a/src/test/java/freshtrash/freshtrashbackend/controller/ProductReviewApiTest.java +++ b/src/test/java/freshtrash/freshtrashbackend/controller/ProductReviewControllerTest.java @@ -22,9 +22,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@WebMvcTest(ProductReviewApi.class) +@WebMvcTest(ProductReviewController.class) @Import(TestSecurityConfig.class) -class ProductReviewApiTest { +class ProductReviewControllerTest { @Autowired private MockMvc mvc; diff --git a/src/test/java/freshtrash/freshtrashbackend/integration/AuctionIntegrationTest.java b/src/test/java/freshtrash/freshtrashbackend/integration/AuctionIntegrationTest.java index 9fbcaa6e..34a08678 100644 --- a/src/test/java/freshtrash/freshtrashbackend/integration/AuctionIntegrationTest.java +++ b/src/test/java/freshtrash/freshtrashbackend/integration/AuctionIntegrationTest.java @@ -2,7 +2,7 @@ import freshtrash.freshtrashbackend.Fixture.FixtureDto; import freshtrash.freshtrashbackend.config.TestSecurityConfig; -import freshtrash.freshtrashbackend.controller.AuctionApi; +import freshtrash.freshtrashbackend.controller.AuctionController; import freshtrash.freshtrashbackend.dto.request.BiddingRequest; import freshtrash.freshtrashbackend.entity.constants.UserRole; import freshtrash.freshtrashbackend.exception.AuctionException; @@ -35,7 +35,7 @@ @Import(TestSecurityConfig.class) public class AuctionIntegrationTest { @Autowired - AuctionApi auctionApi; + AuctionController auctionController; @Autowired AuctionService auctionService; @@ -63,7 +63,7 @@ void bidding() throws InterruptedException { int price = random.nextInt((5000 - 1000) + 1) + 1000; price -= price % 10; log.info("Bidding price: {}", price); - auctionApi.placeBidding(auctionId, new BiddingRequest(price), FixtureDto.createMemberPrincipal()); + auctionController.placeBidding(auctionId, new BiddingRequest(price), FixtureDto.createMemberPrincipal()); latch.countDown(); latch.await(); } catch (InterruptedException e) {