Refactor the project directory

src/main/java/com/example/springdemo/serviceImpl/MerchantsServiceImpl.java

@@ -1,4 +1,4 @@
-package com.example.springdemo.service;
+package com.example.springdemo.serviceImpl;
 
 import com.example.springdemo.dao.DishesRepository;
 import com.example.springdemo.dao.MerchantsPasswordRepository;
@@ -6,6 +6,7 @@ import com.example.springdemo.dao.MerchantsRepository;
 import com.example.springdemo.entities.Dishes;
 import com.example.springdemo.entities.Merchants;
 import com.example.springdemo.entities.password.MerchantsPassword;
+import com.example.springdemo.service.MerchantsService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/example/springdemo/serviceImpl/OrderDishesServiceImpl.java

@@ -1,6 +1,7 @@
-package com.example.springdemo.service;
+package com.example.springdemo.serviceImpl;
 
 import com.example.springdemo.entities.OrderDishes;
+import com.example.springdemo.service.OrderDishesService;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/com/example/springdemo/serviceImpl/OrdersServiceImpl.java

@@ -1,7 +1,8 @@
-package com.example.springdemo.service;
+package com.example.springdemo.serviceImpl;
 
 import com.example.springdemo.dao.OrdersRepository;
 import com.example.springdemo.entities.Orders;
+import com.example.springdemo.service.OrdersService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 

src/main/java/com/example/springdemo/serviceImpl/RolesPermissionsServiceImpl.java

@@ -1,8 +1,10 @@
-package com.example.springdemo.service;
+package com.example.springdemo.serviceImpl;
 
 import com.example.springdemo.dao.RolesPermissionsRepository;
 import com.example.springdemo.entities.RBAC.RolesPermissions;
+import com.example.springdemo.service.RolesPermissionsService;
 import jakarta.annotation.Resource;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -21,6 +23,7 @@ public class RolesPermissionsServiceImpl implements RolesPermissionsService {
     }
 
     @Override
+    @Modifying
     @Transactional(rollbackFor = Exception.class)
     public int RemovePermissionsFromRole(Long roleId, Long permissionId) {
         int count;
@@ -33,6 +36,7 @@ public class RolesPermissionsServiceImpl implements RolesPermissionsService {
     }
 
     @Override
+    @Modifying
     @Transactional(rollbackFor = Exception.class)
     public int updateRolePermissions(Long roleId, Long permissionId) {
         int count;

src/test/java/com/example/springdemo/service/UsersServiceTests.java

@@ -4,6 +4,7 @@ import com.example.springdemo.dao.UsersPasswordRepository;
 import com.example.springdemo.dao.UsersRepository;
 import com.example.springdemo.entities.Users;
 import com.example.springdemo.entities.password.UsersPassword;
+import com.example.springdemo.serviceImpl.UsersServiceImpl;
 import jakarta.annotation.Resource;
 import lombok.Data;
 import org.jetbrains.annotations.NotNull;
@@ -20,7 +21,6 @@ import org.springframework.test.annotation.Rollback;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;