Code Refactor

Author: manirDev

src/main/java/com/manir/springbootecommercerestapi/dto/FaqDto.java

@@ -1,9 +1,10 @@
 package com.manir.springbootecommercerestapi.dto;
 
+import com.manir.springbootecommercerestapi.model.BaseEntity;
 import lombok.Data;
 
 @Data
-public class FaqDto {
+public class FaqDto extends BaseEntity {
     private Long id;
     private String question;
     private String answer;

src/main/java/com/manir/springbootecommercerestapi/service/CommonService.java

@@ -19,4 +19,10 @@ public interface CommonService<T> {
 
     //get current authenticated user
     User getCurrentAuthenticatedUser(Authentication authentication);
+
+    //entity mapper
+    T mapToEntity(T type);
+
+    //dto mapper
+    T mapToDto(T type);
 }

src/main/java/com/manir/springbootecommercerestapi/service/Impl/CommonServiceImpl.java

@@ -9,6 +9,7 @@
 import com.manir.springbootecommercerestapi.service.CommonService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.modelmapper.ModelMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
@@ -17,6 +18,7 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
 
@@ -27,12 +29,15 @@
 @Service
 @Slf4j
 @AllArgsConstructor
+@Component("commonService")
 public class CommonServiceImpl implements CommonService{
 
     private static Logger logger = LoggerFactory.getLogger(CategoryServiceImpl.class);
 
     @Resource(name = "userRepository")
     private final UserRepository userRepository;
+    @Resource(name = "modelMapper")
+    private final ModelMapper modelMapper;
 
     @Override
     public CommonResponse getResponseContent(Page page, List dtoList) {
@@ -75,4 +80,16 @@ public User getCurrentAuthenticatedUser(Authentication authentication) {
 
         return currentUser;
     }
+
+    @Override
+    public Object mapToEntity(Object type) {
+        Object entityObject = modelMapper.map(type, Object.class);
+        return entityObject;
+    }
+
+    @Override
+    public Object mapToDto(Object type) {
+        Object dtoObject = modelMapper.map(type, Object.class);
+        return dtoObject;
+    }
 }

src/main/java/com/manir/springbootecommercerestapi/service/Impl/FaqServiceImpl.java

@@ -4,6 +4,7 @@
 import com.manir.springbootecommercerestapi.exception.ResourceNotFoundException;
 import com.manir.springbootecommercerestapi.model.Faq;
 import com.manir.springbootecommercerestapi.repository.FaqRepository;
+import com.manir.springbootecommercerestapi.service.CommonService;
 import com.manir.springbootecommercerestapi.service.FaqService;
 import lombok.AllArgsConstructor;
 import org.modelmapper.ModelMapper;
@@ -20,6 +21,8 @@ public class FaqServiceImpl implements FaqService {
     private final FaqRepository faqRepository;
     @Resource(name = "modelMapper")
     private final ModelMapper modelMapper;
+    @Resource(name = "commonService")
+    private final CommonService commonService;
 
     @Override
     public FaqDto addFaq(FaqDto faqDto) {