Move Service to domain layer (#27)

hdescottes · Jun 7, 2024 · 65ebcca · 65ebcca
1 parent b6dc6f4
commit 65ebcca
Show file tree

Hide file tree

Showing 19 changed files with 54 additions and 39 deletions.
diff --git a/...ashboard/appplication/stock/StockApi.java → ...dashboard/application/stock/StockApi.java b/...ashboard/appplication/stock/StockApi.java → ...dashboard/application/stock/StockApi.java
@@ -1,6 +1,6 @@
-package com.project.reactdashboard.appplication.stock;
+package com.project.reactdashboard.application.stock;
 
-import com.project.reactdashboard.appplication.stock.model.StockApplication;
+import com.project.reactdashboard.application.stock.model.StockApplication;
 
 import java.util.List;
 

diff --git a/...ashboard/appplication/stock/StockSpi.java → ...dashboard/application/stock/StockSpi.java b/...ashboard/appplication/stock/StockSpi.java → ...dashboard/application/stock/StockSpi.java
@@ -1,6 +1,6 @@
-package com.project.reactdashboard.appplication.stock;
+package com.project.reactdashboard.application.stock;
 
-import com.project.reactdashboard.appplication.stock.model.StockApplication;
+import com.project.reactdashboard.application.stock.model.StockApplication;
 
 import java.time.OffsetDateTime;
 import java.util.List;

diff --git a/.../stock/mapper/StockApplicationMapper.java → .../stock/mapper/StockApplicationMapper.java b/.../stock/mapper/StockApplicationMapper.java → .../stock/mapper/StockApplicationMapper.java
@@ -1,6 +1,6 @@
-package com.project.reactdashboard.appplication.stock.mapper;
+package com.project.reactdashboard.application.stock.mapper;
 
-import com.project.reactdashboard.appplication.stock.model.StockApplication;
+import com.project.reactdashboard.application.stock.model.StockApplication;
 import com.project.reactdashboard.infrastructure.stock.controllers.StockDto;
 import org.springframework.stereotype.Component;
 

diff --git a/...ication/stock/model/StockApplication.java → ...ication/stock/model/StockApplication.java b/...ication/stock/model/StockApplication.java → ...ication/stock/model/StockApplication.java
@@ -1,4 +1,4 @@
-package com.project.reactdashboard.appplication.stock.model;
+package com.project.reactdashboard.application.stock.model;
 
 import java.io.Serializable;
 import java.time.OffsetDateTime;

diff --git a/.../stock/model/SymbolValuesApplication.java → .../stock/model/SymbolValuesApplication.java b/.../stock/model/SymbolValuesApplication.java → .../stock/model/SymbolValuesApplication.java
@@ -1,4 +1,4 @@
-package com.project.reactdashboard.appplication.stock.model;
+package com.project.reactdashboard.application.stock.model;
 
 public class SymbolValuesApplication {
 

diff --git a/app-api/src/main/java/com/project/reactdashboard/configuration/StockMarketConfiguration.java b/app-api/src/main/java/com/project/reactdashboard/configuration/StockMarketConfiguration.java
@@ -0,0 +1,12 @@
+package com.project.reactdashboard.configuration;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+
+@Configuration
+@ComponentScan(
+        basePackages = {"com.project.reactdashboard.domain.stock"},
+        includeFilters = {@ComponentScan.Filter(type = FilterType.ANNOTATION, classes = {UseCase.class})})
+public class StockMarketConfiguration {
+}
diff --git a/app-api/src/main/java/com/project/reactdashboard/configuration/UseCase.java b/app-api/src/main/java/com/project/reactdashboard/configuration/UseCase.java
@@ -0,0 +1,8 @@
+package com.project.reactdashboard.configuration;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UseCase {
+}
diff --git a/...oard/appplication/stock/StockService.java → ...tdashboard/domain/stock/StockService.java b/...oard/appplication/stock/StockService.java → ...tdashboard/domain/stock/StockService.java
@@ -1,15 +1,17 @@
-package com.project.reactdashboard.appplication.stock;
+package com.project.reactdashboard.domain.stock;
 
-import com.project.reactdashboard.appplication.stock.model.StockApplication;
-import org.springframework.stereotype.Service;
+import com.project.reactdashboard.application.stock.StockApi;
+import com.project.reactdashboard.application.stock.StockSpi;
+import com.project.reactdashboard.application.stock.model.StockApplication;
+import com.project.reactdashboard.configuration.UseCase;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.List;
 
 import static com.project.reactdashboard.domain.stock.Date.lastWorkingDay;
 
-@Service
+@UseCase
 public class StockService implements StockApi {
 
     private final StockSpi stockSpi;

diff --git a/...ain/java/com/project/reactdashboard/infrastructure/stock/controllers/StockController.java b/...ain/java/com/project/reactdashboard/infrastructure/stock/controllers/StockController.java
@@ -1,8 +1,8 @@
 package com.project.reactdashboard.infrastructure.stock.controllers;
 
-import com.project.reactdashboard.appplication.stock.StockApi;
-import com.project.reactdashboard.appplication.stock.mapper.StockApplicationMapper;
-import com.project.reactdashboard.appplication.stock.model.StockApplication;
+import com.project.reactdashboard.application.stock.StockApi;
+import com.project.reactdashboard.application.stock.mapper.StockApplicationMapper;
+import com.project.reactdashboard.application.stock.model.StockApplication;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

diff --git a/.../com/project/reactdashboard/infrastructure/stock/persistence/StockPersistenceService.java b/.../com/project/reactdashboard/infrastructure/stock/persistence/StockPersistenceService.java
@@ -1,7 +1,7 @@
 package com.project.reactdashboard.infrastructure.stock.persistence;
 
-import com.project.reactdashboard.appplication.stock.StockSpi;
-import com.project.reactdashboard.appplication.stock.model.StockApplication;
+import com.project.reactdashboard.application.stock.StockSpi;
+import com.project.reactdashboard.application.stock.model.StockApplication;
 import com.project.reactdashboard.infrastructure.stock.persistence.mapper.StockMapper;
 import com.project.reactdashboard.infrastructure.stock.persistence.entities.Stock;
 import org.springframework.stereotype.Service;

diff --git a/.../java/com/project/reactdashboard/infrastructure/stock/persistence/mapper/StockMapper.java b/.../java/com/project/reactdashboard/infrastructure/stock/persistence/mapper/StockMapper.java
@@ -1,6 +1,6 @@
 package com.project.reactdashboard.infrastructure.stock.persistence.mapper;
 
-import com.project.reactdashboard.appplication.stock.model.StockApplication;
+import com.project.reactdashboard.application.stock.model.StockApplication;
 import com.project.reactdashboard.infrastructure.stock.persistence.entities.Stock;
 import org.springframework.stereotype.Component;
 

diff --git a/...om/project/reactdashboard/infrastructure/stock/persistence/mapper/SymbolValuesMapper.java b/...om/project/reactdashboard/infrastructure/stock/persistence/mapper/SymbolValuesMapper.java
@@ -1,6 +1,6 @@
 package com.project.reactdashboard.infrastructure.stock.persistence.mapper;
 
-import com.project.reactdashboard.appplication.stock.model.SymbolValuesApplication;
+import com.project.reactdashboard.application.stock.model.SymbolValuesApplication;
 import com.project.reactdashboard.infrastructure.stock.persistence.entities.SymbolValues;
 import org.springframework.stereotype.Component;
 

diff --git a/app-api/src/test/java/com/project/reactdashboard/ObjectRandomizer.java b/app-api/src/test/java/com/project/reactdashboard/ObjectRandomizer.java
@@ -1,8 +1,8 @@
 package com.project.reactdashboard;
 
-import com.project.reactdashboard.appplication.stock.model.StockApplication;
+import com.project.reactdashboard.application.stock.model.StockApplication;
 import com.project.reactdashboard.infrastructure.stock.controllers.StockDto;
-import com.project.reactdashboard.appplication.stock.model.SymbolValuesApplication;
+import com.project.reactdashboard.application.stock.model.SymbolValuesApplication;
 import com.project.reactdashboard.infrastructure.stock.persistence.entities.Stock;
 import com.project.reactdashboard.infrastructure.stock.persistence.entities.SymbolValues;
 

diff --git a/...ck/mapper/StockApplicationMapperTest.java → ...ck/mapper/StockApplicationMapperTest.java b/...ck/mapper/StockApplicationMapperTest.java → ...ck/mapper/StockApplicationMapperTest.java
@@ -1,7 +1,6 @@
-package com.project.reactdashboard.appplication.stock.mapper;
+package com.project.reactdashboard.application.stock.mapper;
 
-import com.project.reactdashboard.appplication.stock.mapper.StockApplicationMapper;
-import com.project.reactdashboard.appplication.stock.model.StockApplication;
+import com.project.reactdashboard.application.stock.model.StockApplication;
 import com.project.reactdashboard.infrastructure.stock.controllers.StockDto;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/.../appplication/stock/StockServiceTest.java → ...hboard/domain/stock/StockServiceTest.java b/.../appplication/stock/StockServiceTest.java → ...hboard/domain/stock/StockServiceTest.java
@@ -1,8 +1,7 @@
-package com.project.reactdashboard.appplication.stock;
+package com.project.reactdashboard.domain.stock;
 
-import com.project.reactdashboard.appplication.stock.StockService;
-import com.project.reactdashboard.appplication.stock.StockSpi;
-import com.project.reactdashboard.appplication.stock.model.StockApplication;
+import com.project.reactdashboard.application.stock.StockSpi;
+import com.project.reactdashboard.application.stock.model.StockApplication;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;

diff --git a/...java/com/project/reactdashboard/infrastructure/stock/controllers/StockControllerTest.java b/...java/com/project/reactdashboard/infrastructure/stock/controllers/StockControllerTest.java
@@ -5,11 +5,9 @@
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.project.reactdashboard.appplication.stock.StockApi;
-import com.project.reactdashboard.appplication.stock.mapper.StockApplicationMapper;
-import com.project.reactdashboard.appplication.stock.model.StockApplication;
-import com.project.reactdashboard.infrastructure.stock.controllers.StockController;
-import com.project.reactdashboard.infrastructure.stock.controllers.StockDto;
+import com.project.reactdashboard.application.stock.StockApi;
+import com.project.reactdashboard.application.stock.mapper.StockApplicationMapper;
+import com.project.reactdashboard.application.stock.model.StockApplication;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;

diff --git a/.../project/reactdashboard/infrastructure/stock/persistence/StockPersistenceServiceTest.java b/.../project/reactdashboard/infrastructure/stock/persistence/StockPersistenceServiceTest.java
@@ -1,6 +1,6 @@
 package com.project.reactdashboard.infrastructure.stock.persistence;
 
-import com.project.reactdashboard.appplication.stock.model.StockApplication;
+import com.project.reactdashboard.application.stock.model.StockApplication;
 import com.project.reactdashboard.infrastructure.stock.persistence.mapper.StockMapper;
 import com.project.reactdashboard.infrastructure.stock.persistence.entities.Stock;
 import org.junit.jupiter.api.Test;

diff --git a/...a/com/project/reactdashboard/infrastructure/stock/persistence/mapper/StockMapperTest.java b/...a/com/project/reactdashboard/infrastructure/stock/persistence/mapper/StockMapperTest.java
@@ -1,9 +1,7 @@
 package com.project.reactdashboard.infrastructure.stock.persistence.mapper;
 
-import com.project.reactdashboard.appplication.stock.model.StockApplication;
+import com.project.reactdashboard.application.stock.model.StockApplication;
 import com.project.reactdashboard.infrastructure.stock.persistence.entities.Stock;
-import com.project.reactdashboard.infrastructure.stock.persistence.mapper.StockMapper;
-import com.project.reactdashboard.infrastructure.stock.persistence.mapper.SymbolValuesMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/...roject/reactdashboard/infrastructure/stock/persistence/mapper/SymbolValuesMapperTest.java b/...roject/reactdashboard/infrastructure/stock/persistence/mapper/SymbolValuesMapperTest.java
@@ -1,8 +1,7 @@
 package com.project.reactdashboard.infrastructure.stock.persistence.mapper;
 
-import com.project.reactdashboard.appplication.stock.model.SymbolValuesApplication;
+import com.project.reactdashboard.application.stock.model.SymbolValuesApplication;
 import com.project.reactdashboard.infrastructure.stock.persistence.entities.SymbolValues;
-import com.project.reactdashboard.infrastructure.stock.persistence.mapper.SymbolValuesMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;