Relocated Datadis class and changed config endpoint from /api/v1/data…

…dis/config to /api/v1/consumption/datadis/config
lucoenergia · Apr 15, 2024 · 65d72ae · 65d72ae
1 parent 00b5d3a
commit 65d72ae
Show file tree

Hide file tree

Showing 23 changed files with 49 additions and 37 deletions.
diff --git a/...ture/shared/datadis/DatadisException.java → ...consumption/datadis/DatadisException.java b/...ture/shared/datadis/DatadisException.java → ...consumption/datadis/DatadisException.java
@@ -1,4 +1,4 @@
-package org.lucoenergia.conluz.infrastructure.shared.datadis;
+package org.lucoenergia.conluz.domain.consumption.datadis;
 
 public class DatadisException extends RuntimeException {
 

diff --git a/...ucoenergia/conluz/infrastructure/admin/datadis/SetDatadisConfigurationRepositoryImpl.java b/...ucoenergia/conluz/infrastructure/admin/datadis/SetDatadisConfigurationRepositoryImpl.java
@@ -2,8 +2,8 @@
 
 import org.lucoenergia.conluz.domain.admin.datadis.DatadisConfig;
 import org.lucoenergia.conluz.domain.admin.datadis.SetDatadisConfigurationRepository;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisConfigEntity;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisConfigRepository;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.config.DatadisConfigEntity;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisConfigRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;

diff --git a/...rg/lucoenergia/conluz/infrastructure/admin/supply/get/GetSupplyRepositoryDatadisRest.java b/...rg/lucoenergia/conluz/infrastructure/admin/supply/get/GetSupplyRepositoryDatadisRest.java
@@ -8,9 +8,9 @@
 import org.lucoenergia.conluz.domain.admin.supply.DatadisSupply;
 import org.lucoenergia.conluz.domain.admin.supply.get.GetSupplyRepositoryDatadis;
 import org.lucoenergia.conluz.domain.admin.user.User;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisAuthorizer;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisConfigEntity;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisParams;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisAuthorizer;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.config.DatadisConfigEntity;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisParams;
 import org.lucoenergia.conluz.infrastructure.shared.web.rest.ConluzRestClientBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...ure/shared/datadis/DatadisAuthorizer.java → ...onsumption/datadis/DatadisAuthorizer.java b/...ure/shared/datadis/DatadisAuthorizer.java → ...onsumption/datadis/DatadisAuthorizer.java
@@ -1,6 +1,8 @@
-package org.lucoenergia.conluz.infrastructure.shared.datadis;
+package org.lucoenergia.conluz.infrastructure.consumption.datadis;
 
 import okhttp3.*;
+import org.lucoenergia.conluz.domain.consumption.datadis.DatadisException;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.config.DatadisConfigEntity;
 import org.lucoenergia.conluz.infrastructure.shared.security.auth.Authorizer;
 import org.lucoenergia.conluz.infrastructure.shared.web.rest.ConluzRestClientBuilder;
 import org.springframework.http.HttpHeaders;

diff --git a/...ared/datadis/DatadisConfigRepository.java → ...tion/datadis/DatadisConfigRepository.java b/...ared/datadis/DatadisConfigRepository.java → ...tion/datadis/DatadisConfigRepository.java
@@ -1,5 +1,6 @@
-package org.lucoenergia.conluz.infrastructure.shared.datadis;
+package org.lucoenergia.conluz.infrastructure.consumption.datadis;
 
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.config.DatadisConfigEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;

diff --git a/...va/org/lucoenergia/conluz/infrastructure/consumption/datadis/DatadisConsumptionPoint.java b/...va/org/lucoenergia/conluz/infrastructure/consumption/datadis/DatadisConsumptionPoint.java
@@ -2,7 +2,7 @@
 
 import org.influxdb.annotation.Column;
 import org.influxdb.annotation.Measurement;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisConfigEntity;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.config.DatadisConfigEntity;
 
 import java.time.Instant;
 

diff --git a/...red/datadis/DatadisDateTimeConverter.java → ...ion/datadis/DatadisDateTimeConverter.java b/...red/datadis/DatadisDateTimeConverter.java → ...ion/datadis/DatadisDateTimeConverter.java
@@ -1,4 +1,4 @@
-package org.lucoenergia.conluz.infrastructure.shared.datadis;
+package org.lucoenergia.conluz.infrastructure.consumption.datadis;
 
 import jakarta.validation.constraints.NotNull;
 import org.lucoenergia.conluz.infrastructure.shared.time.TimeConfiguration;

diff --git a/...ructure/shared/datadis/DatadisParams.java → ...re/consumption/datadis/DatadisParams.java b/...ructure/shared/datadis/DatadisParams.java → ...re/consumption/datadis/DatadisParams.java
@@ -1,7 +1,10 @@
-package org.lucoenergia.conluz.infrastructure.shared.datadis;
+package org.lucoenergia.conluz.infrastructure.consumption.datadis;
 
 public class DatadisParams {
 
+    private DatadisParams() {
+    }
+
     public static final String CUPS = "cups";
     public static final String DISTRIBUTOR_CODE = "distributorCode";
     public static final String AUTHORIZED_NIF = "authorizedNif";

diff --git a/...cture/shared/datadis/MeasurementType.java → .../consumption/datadis/MeasurementType.java b/...cture/shared/datadis/MeasurementType.java → .../consumption/datadis/MeasurementType.java
@@ -1,11 +1,15 @@
-package org.lucoenergia.conluz.infrastructure.shared.datadis;
+package org.lucoenergia.conluz.infrastructure.consumption.datadis;
 
 /**
  * Set it to 0 (Zero) if you want to get the consumption per hour and to 1 (One) if you want to get the consumption per
  * quarter-hour. The hourly query is only available for PointTypes 1 and 2, and in the case of the distributor
  * E-distribución additionally for PointType 3.
  */
 public class MeasurementType {
+
+    private MeasurementType() {
+    }
+
     public static final String PER_HOUR = "0";
     public static final String PER_QUARTER_HOUR = "1";
 }
diff --git a/...e/admin/datadis/ConfigureDatadisBody.java → .../datadis/config/ConfigureDatadisBody.java b/...e/admin/datadis/ConfigureDatadisBody.java → .../datadis/config/ConfigureDatadisBody.java
@@ -1,12 +1,8 @@
-package org.lucoenergia.conluz.infrastructure.admin.datadis;
+package org.lucoenergia.conluz.infrastructure.consumption.datadis.config;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Positive;
 import org.lucoenergia.conluz.domain.admin.datadis.DatadisConfig;
-import org.lucoenergia.conluz.domain.admin.supply.Supply;
-import org.lucoenergia.conluz.domain.admin.user.User;
 
 @Schema(requiredProperties = {
         "username", "password"

diff --git a/...e/shared/datadis/DatadisConfigEntity.java → ...n/datadis/config/DatadisConfigEntity.java b/...e/shared/datadis/DatadisConfigEntity.java → ...n/datadis/config/DatadisConfigEntity.java
@@ -1,4 +1,4 @@
-package org.lucoenergia.conluz.infrastructure.shared.datadis;
+package org.lucoenergia.conluz.infrastructure.consumption.datadis.config;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;

diff --git a/...n/datadis/SetDatadisConfigController.java → ...is/config/SetDatadisConfigController.java b/...n/datadis/SetDatadisConfigController.java → ...is/config/SetDatadisConfigController.java
@@ -1,10 +1,9 @@
-package org.lucoenergia.conluz.infrastructure.admin.datadis;
+package org.lucoenergia.conluz.infrastructure.consumption.datadis.config;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import org.lucoenergia.conluz.domain.admin.config.init.InitService;
 import org.lucoenergia.conluz.domain.admin.datadis.DatadisConfig;
 import org.lucoenergia.conluz.domain.admin.datadis.SetDatadisConfigurationService;
 import org.lucoenergia.conluz.infrastructure.shared.web.apidocs.ApiTag;
@@ -17,7 +16,7 @@
 
 @RestController
 @RequestMapping(
-        value = "/api/v1/datadis/config",
+        value = "/api/v1/consumption/datadis/config",
         consumes = MediaType.APPLICATION_JSON_VALUE,
         produces = MediaType.APPLICATION_JSON_VALUE
 )

diff --git a/...min/datadis/SetDatadisConfigResponse.java → ...adis/config/SetDatadisConfigResponse.java b/...min/datadis/SetDatadisConfigResponse.java → ...adis/config/SetDatadisConfigResponse.java
@@ -1,7 +1,5 @@
-package org.lucoenergia.conluz.infrastructure.admin.datadis;
+package org.lucoenergia.conluz.infrastructure.consumption.datadis.config;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
 import org.apache.commons.lang3.StringUtils;
 import org.lucoenergia.conluz.domain.admin.datadis.DatadisConfig;
 

diff --git a/.../conluz/infrastructure/consumption/datadis/get/GetDatadisConsumptionRepositoryInflux.java b/.../conluz/infrastructure/consumption/datadis/get/GetDatadisConsumptionRepositoryInflux.java
@@ -8,8 +8,8 @@
 import org.lucoenergia.conluz.domain.consumption.datadis.DatadisConsumption;
 import org.lucoenergia.conluz.domain.consumption.datadis.get.GetDatadisConsumptionRepository;
 import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisConsumptionPoint;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisConfigEntity;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisDateTimeConverter;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.config.DatadisConfigEntity;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisDateTimeConverter;
 import org.lucoenergia.conluz.infrastructure.shared.db.influxdb.DateToInfluxDbDateFormatConverter;
 import org.lucoenergia.conluz.infrastructure.shared.db.influxdb.InfluxDbConnectionManager;
 import org.springframework.beans.factory.annotation.Qualifier;

diff --git a/...ia/conluz/infrastructure/consumption/datadis/get/GetDatadisConsumptionRepositoryRest.java b/...ia/conluz/infrastructure/consumption/datadis/get/GetDatadisConsumptionRepositoryRest.java
@@ -10,7 +10,11 @@
 import org.lucoenergia.conluz.domain.consumption.datadis.DatadisConsumption;
 import org.lucoenergia.conluz.domain.consumption.datadis.get.GetDatadisConsumptionRepository;
 import org.lucoenergia.conluz.infrastructure.admin.supply.DatadisSupplyConfigurationException;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.*;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisAuthorizer;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisDateTimeConverter;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisParams;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.MeasurementType;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.config.DatadisConfigEntity;
 import org.lucoenergia.conluz.infrastructure.shared.web.rest.ConluzRestClientBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...infrastructure/consumption/datadis/persist/PersistDatadisConsumptionRepositoryInflux.java b/...infrastructure/consumption/datadis/persist/PersistDatadisConsumptionRepositoryInflux.java
@@ -5,7 +5,7 @@
 import org.influxdb.dto.Point;
 import org.lucoenergia.conluz.domain.consumption.datadis.DatadisConsumption;
 import org.lucoenergia.conluz.domain.consumption.datadis.persist.PersistDatadisConsumptionRepository;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisConfigEntity;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.config.DatadisConfigEntity;
 import org.lucoenergia.conluz.infrastructure.shared.db.influxdb.InfluxDbConnectionManager;
 import org.lucoenergia.conluz.infrastructure.shared.time.DateConverter;
 import org.springframework.stereotype.Repository;

diff --git a/...a/org/lucoenergia/conluz/infrastructure/admin/datadis/SetDatadisConfigControllerTest.java b/...a/org/lucoenergia/conluz/infrastructure/admin/datadis/SetDatadisConfigControllerTest.java
@@ -4,8 +4,9 @@
 import org.junit.jupiter.api.Test;
 import org.lucoenergia.conluz.domain.admin.datadis.DatadisConfig;
 import org.lucoenergia.conluz.domain.admin.datadis.SetDatadisConfigurationRepository;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.config.ConfigureDatadisBody;
 import org.lucoenergia.conluz.infrastructure.shared.BaseControllerTest;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisConfigRepository;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisConfigRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -20,7 +21,7 @@
 @Transactional
 class SetDatadisConfigControllerTest extends BaseControllerTest {
 
-    private static final String URL = "/api/v1/datadis/config";
+    private static final String URL = "/api/v1/consumption/datadis/config";
 
     @Autowired
     private DatadisConfigRepository repository;

diff --git a/...nergia/conluz/infrastructure/admin/datadis/SetDatadisConfigurationRepositoryImplTest.java b/...nergia/conluz/infrastructure/admin/datadis/SetDatadisConfigurationRepositoryImplTest.java
@@ -2,8 +2,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.lucoenergia.conluz.domain.admin.datadis.DatadisConfig;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisConfigEntity;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisConfigRepository;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.config.DatadisConfigEntity;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisConfigRepository;
 import org.mockito.Mockito;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;

diff --git a/...nfrastructure/consumption/datadis/GetDatadisConsumptionRepositoryRestIntegrationTest.java b/...nfrastructure/consumption/datadis/GetDatadisConsumptionRepositoryRestIntegrationTest.java
@@ -8,8 +8,7 @@
 import org.lucoenergia.conluz.domain.consumption.datadis.DatadisConsumption;
 import org.lucoenergia.conluz.infrastructure.consumption.datadis.get.GetDatadisConsumptionRepositoryRest;
 import org.lucoenergia.conluz.infrastructure.shared.BaseIntegrationTest;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisConfigEntity;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisConfigRepository;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.config.DatadisConfigEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 

diff --git a/...ia/conluz/infrastructure/consumption/datadis/GetDatadisConsumptionRepositoryRestTest.java b/...ia/conluz/infrastructure/consumption/datadis/GetDatadisConsumptionRepositoryRestTest.java
@@ -9,8 +9,6 @@
 import org.lucoenergia.conluz.domain.admin.user.User;
 import org.lucoenergia.conluz.domain.consumption.datadis.DatadisConsumption;
 import org.lucoenergia.conluz.infrastructure.consumption.datadis.get.GetDatadisConsumptionRepositoryRest;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisAuthorizer;
-import org.lucoenergia.conluz.infrastructure.shared.datadis.DatadisDateTimeConverter;
 import org.lucoenergia.conluz.infrastructure.shared.web.rest.ConluzRestClientBuilder;
 import org.mockito.Mockito;
 

diff --git a/...rg/lucoenergia/conluz/infrastructure/shared/datadis/DatadisAuthorizerIntegrationTest.java b/...rg/lucoenergia/conluz/infrastructure/shared/datadis/DatadisAuthorizerIntegrationTest.java
@@ -3,6 +3,9 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisAuthorizer;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisConfigRepository;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.config.DatadisConfigEntity;
 import org.lucoenergia.conluz.infrastructure.shared.BaseIntegrationTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;

diff --git a/...test/java/org/lucoenergia/conluz/infrastructure/shared/datadis/DatadisAuthorizerTest.java b/...test/java/org/lucoenergia/conluz/infrastructure/shared/datadis/DatadisAuthorizerTest.java
@@ -4,6 +4,10 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisAuthorizer;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisConfigRepository;
+import org.lucoenergia.conluz.domain.consumption.datadis.DatadisException;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.config.DatadisConfigEntity;
 import org.lucoenergia.conluz.infrastructure.shared.web.rest.ConluzRestClientBuilder;
 import org.mockito.Mockito;
 

diff --git a/...va/org/lucoenergia/conluz/infrastructure/shared/datadis/DatadisDateTimeConverterTest.java b/...va/org/lucoenergia/conluz/infrastructure/shared/datadis/DatadisDateTimeConverterTest.java
@@ -2,12 +2,12 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.lucoenergia.conluz.infrastructure.consumption.datadis.DatadisDateTimeConverter;
 import org.lucoenergia.conluz.infrastructure.shared.time.TimeConfiguration;
 
 import java.time.Instant;
 import java.time.Month;
 import java.time.ZoneId;
-import java.time.format.DateTimeParseException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;