chore: imports package names

Author: tennyros

src/test/java/com/github/tennyros/subscription_service/controller/SubscriptionControllerTest.java

@@ -1,7 +1,7 @@
 package com.github.tennyros.subscription_service.controller;
 
 import com.github.tennyros.subscription_service.dto.response.TopSubscriptions;
-import com.github.tennyros.subscription_service.http.rest.SubscriptionController;
+import com.github.tennyros.subscription_service.rest.controller.SubscriptionController;
 import com.github.tennyros.subscription_service.service.SubscriptionService;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -35,14 +35,14 @@ void getTopSubscriptions_shouldReturnListOfTopSubscriptions() {
                 new TopSubscriptions("Spotify", 10L),
                 new TopSubscriptions("Netflix", 7L)
         );
-        when(subscriptionService.getTop3Subs()).thenReturn(topSubs);
+        when(subscriptionService.getTop3Subscriptions()).thenReturn(topSubs);
 
         ResponseEntity<List<TopSubscriptions>> response = subscriptionController.getTopSubscriptions();
 
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertNotNull(response.getBody());
         assertEquals(3, response.getBody().size());
         assertEquals("YouTube", response.getBody().get(0).serviceName());
-        verify(subscriptionService, times(1)).getTop3Subs();
+        verify(subscriptionService, times(1)).getTop3Subscriptions();
     }
 }

src/test/java/com/github/tennyros/subscription_service/controller/UserControllerTest.java

@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tennyros.subscription_service.dto.request.UserRequest;
 import com.github.tennyros.subscription_service.dto.response.UserResponse;
-import com.github.tennyros.subscription_service.http.rest.UserController;
+import com.github.tennyros.subscription_service.rest.controller.UserController;
 import com.github.tennyros.subscription_service.mapper.UserMapper;
-import com.github.tennyros.subscription_service.model.User;
+import com.github.tennyros.subscription_service.entity.User;
 import com.github.tennyros.subscription_service.service.UserService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

src/test/java/com/github/tennyros/subscription_service/controller/UserSubscriptionControllerTest.java

@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tennyros.subscription_service.dto.request.SubscriptionRequest;
 import com.github.tennyros.subscription_service.dto.response.SubscriptionResponse;
-import com.github.tennyros.subscription_service.http.rest.UserSubscriptionController;
+import com.github.tennyros.subscription_service.rest.controller.UserSubscriptionController;
 import com.github.tennyros.subscription_service.mapper.SubscriptionMapper;
-import com.github.tennyros.subscription_service.model.Subscription;
+import com.github.tennyros.subscription_service.entity.Subscription;
 import com.github.tennyros.subscription_service.service.SubscriptionService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,6 +93,6 @@ void deleteUserSubscription_returnsNoContent_whenSuccessful() throws Exception {
         mockMvc.perform(delete("/api/v1/users/{userId}/subscriptions/{subId}", ID, subId))
                 .andExpect(status().isNoContent());
 
-        verify(subscriptionService).deleteUserSubscription(ID, subId);
+        verify(subscriptionService).cancelUserSubscription(ID, subId);
     }
 }

src/test/java/com/github/tennyros/subscription_service/mapper/SubscriptionMapperImplTest.java

@@ -2,7 +2,7 @@
 
 import com.github.tennyros.subscription_service.dto.request.SubscriptionRequest;
 import com.github.tennyros.subscription_service.dto.response.SubscriptionResponse;
-import com.github.tennyros.subscription_service.model.Subscription;
+import com.github.tennyros.subscription_service.entity.Subscription;
 import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
 

src/test/java/com/github/tennyros/subscription_service/mapper/UserMapperTest.java

@@ -3,8 +3,8 @@
 import com.github.tennyros.subscription_service.dto.request.UserRequest;
 import com.github.tennyros.subscription_service.dto.response.SubscriptionResponse;
 import com.github.tennyros.subscription_service.dto.response.UserResponse;
-import com.github.tennyros.subscription_service.model.Subscription;
-import com.github.tennyros.subscription_service.model.User;
+import com.github.tennyros.subscription_service.entity.Subscription;
+import com.github.tennyros.subscription_service.entity.User;
 import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;

src/test/java/com/github/tennyros/subscription_service/service/SubscriptionServiceTest.java

@@ -5,8 +5,8 @@
 import com.github.tennyros.subscription_service.exception.SubscriptionNotFoundException;
 import com.github.tennyros.subscription_service.exception.UsersSubscriptionAlreadyExistsException;
 import com.github.tennyros.subscription_service.exception.UserNotFoundException;
-import com.github.tennyros.subscription_service.model.Subscription;
-import com.github.tennyros.subscription_service.model.User;
+import com.github.tennyros.subscription_service.entity.Subscription;
+import com.github.tennyros.subscription_service.entity.User;
 import com.github.tennyros.subscription_service.repository.SubscriptionRepository;
 import com.github.tennyros.subscription_service.repository.UserRepository;
 import com.github.tennyros.subscription_service.service.impl.SubscriptionServiceImpl;
@@ -125,32 +125,32 @@ void deleteSubscription_returnsNoContent_whenSuccessful() {
         when(userRepository.existsById(ID)).thenReturn(true);
         when(subscriptionRepository.deleteByIdAndUserId(ID, ID)).thenReturn(1);
 
-        subscriptionService.deleteUserSubscription(ID, ID);
+        subscriptionService.cancelUserSubscription(ID, ID);
 
         verify(subscriptionRepository).deleteByIdAndUserId(ID, ID);
     }
 
     @Test
-    void deleteUserSubscription_throwsException_whenNotFound() {
+    void cancelUserSubscription_throwsException_whenNotFound() {
         when(userRepository.existsById(ID)).thenReturn(true);
         when(subscriptionRepository.deleteByIdAndUserId(ID, ID)).thenReturn(0);
 
         assertThrows(SubscriptionNotFoundException.class,
-                () -> subscriptionService.deleteUserSubscription(ID, ID));
+                () -> subscriptionService.cancelUserSubscription(ID, ID));
 
         verify(subscriptionRepository).deleteByIdAndUserId(ID, ID);
     }
 
     @Test
-    void getTop3Subs_returnsList() {
+    void getTop3Subscriptions_returnsList() {
         List<TopSubscriptions> projections = List.of(
                 new TopSubscriptions("Netflix", 100L),
                 new TopSubscriptions("YouTube Premium", 50L)
         );
 
         when(subscriptionRepository.findTop3PopularSubscriptions()).thenReturn(projections);
 
-        List<TopSubscriptions> result = subscriptionService.getTop3Subs();
+        List<TopSubscriptions> result = subscriptionService.getTop3Subscriptions();
 
         assertEquals(2, result.size());
         assertEquals("Netflix", result.get(0).serviceName());

src/test/java/com/github/tennyros/subscription_service/service/UserServiceTest.java

@@ -2,7 +2,7 @@
 
 import com.github.tennyros.subscription_service.exception.UserAlreadyExistsException;
 import com.github.tennyros.subscription_service.exception.UserNotFoundException;
-import com.github.tennyros.subscription_service.model.User;
+import com.github.tennyros.subscription_service.entity.User;
 import com.github.tennyros.subscription_service.repository.UserRepository;
 import com.github.tennyros.subscription_service.service.impl.UserServiceImpl;
 import org.junit.jupiter.api.Test;