Feat: conflicts solved

backend/sportsmatch/src/main/java/com/sportsmatch/controllers/SportController.java

@@ -1,7 +1,7 @@
 package com.sportsmatch.controllers;
 
 import com.sportsmatch.dtos.SportDTO;
-import com.sportsmatch.service.SportService;
+import com.sportsmatch.services.SportService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.GetMapping;

backend/sportsmatch/src/main/java/com/sportsmatch/mappers/SportMapper.java

@@ -19,7 +19,7 @@ public class SportMapper {
      * @param entity The Sport entity to be converted.
      * @return SportDTO containing information from the Sport entity.
      */
-    public static SportDTO toDTO (Sport entity) {
+    public static SportDTO toDTO(Sport entity) {
         return SportDTO.builder()
                 .name(entity.getName())
                 .build();

backend/sportsmatch/src/main/java/com/sportsmatch/service/SportService.java → backend/sportsmatch/src/main/java/com/sportsmatch/services/SportService.java

@@ -1,4 +1,4 @@
-package com.sportsmatch.service;
+package com.sportsmatch.services;
 
 import com.sportsmatch.dtos.SportDTO;
 import org.springframework.data.domain.Pageable;

backend/sportsmatch/src/main/java/com/sportsmatch/service/SportServiceImp.java → backend/sportsmatch/src/main/java/com/sportsmatch/services/SportServiceImp.java

@@ -1,8 +1,9 @@
-package com.sportsmatch.service;
+package com.sportsmatch.services;
 
 import com.sportsmatch.dtos.SportDTO;
 import com.sportsmatch.mappers.SportMapper;
 import com.sportsmatch.repositories.SportRepository;
+import com.sportsmatch.services.SportService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

backend/sportsmatch/src/test/java/com/sportsmatch/service/SportServiceImpTest.java

@@ -3,6 +3,7 @@
 import com.sportsmatch.dtos.SportDTO;
 import com.sportsmatch.models.Sport;
 import com.sportsmatch.repositories.SportRepository;
+import com.sportsmatch.services.SportServiceImp;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;