Skip Datadis consumption sync when supply does not have distributor code

lucoenergia · Jun 16, 2024 · 0359282 · 0359282
1 parent 8ffd2a3
commit 0359282
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/...main/java/org/lucoenergia/conluz/domain/admin/supply/sync/DatadisSuppliesSyncService.java b/...main/java/org/lucoenergia/conluz/domain/admin/supply/sync/DatadisSuppliesSyncService.java
@@ -46,6 +46,9 @@ public void synchronizeSupplies() {
                 .collect(Collectors.toMap(Supply::getCode, supply -> supply));
 
         for (User user : allUsers) {
+
+            LOGGER.info("Processing users with ID {}", user.getId());
+
             List<DatadisSupply> datadisSupplies = getSupplyRepositoryDatadis.getSuppliesByUser(user);
             for (DatadisSupply datadisSupply : datadisSupplies) {
                 Supply supply = allSupplies.get(datadisSupply.getCups());

diff --git a/...org/lucoenergia/conluz/domain/consumption/datadis/sync/DatadisConsumptionSyncService.java b/...org/lucoenergia/conluz/domain/consumption/datadis/sync/DatadisConsumptionSyncService.java
@@ -1,5 +1,6 @@
 package org.lucoenergia.conluz.domain.consumption.datadis.sync;
 
+import org.apache.commons.lang3.StringUtils;
 import org.lucoenergia.conluz.domain.admin.supply.Supply;
 import org.lucoenergia.conluz.domain.admin.supply.get.GetSupplyRepository;
 import org.lucoenergia.conluz.domain.consumption.datadis.DatadisConsumption;
@@ -49,6 +50,11 @@ public void synchronizeConsumptions() {
 
         for (Supply supply : allSupplies) {
 
+            if (StringUtils.isBlank(supply.getDatadisDistributorCode())) {
+                LOGGER.warn("Skipping supply with ID: {} because does not have distributor code", supply.getId());
+                continue;
+            }
+
             LOGGER.info("Processing supply with ID: {}", supply.getId());
 
             // Get validity date

diff --git a/...ia/conluz/infrastructure/consumption/datadis/get/GetDatadisConsumptionRepositoryRest.java b/...ia/conluz/infrastructure/consumption/datadis/get/GetDatadisConsumptionRepositoryRest.java
@@ -101,7 +101,7 @@ public List<DatadisConsumption> getHourlyConsumptionsByMonth(@NotNull Supply sup
                 result.addAll(consumptions);
             } else {
                 LOGGER.error("Unable to get consumptions for supply with ID {}. Code {}, message: {}",
-                        supply.getCode(), response.code(), response.body() != null ? response.body().string() : response.message());
+                        supply.getId(), response.code(), response.body() != null ? response.body().string() : response.message());
             }
         } catch (IOException e) {
             LOGGER.error("Unable to get consumptions from datadis.es", e);

diff --git a/...lucoenergia/conluz/domain/consumption/datadis/sync/DatadisConsumptionSyncServiceTest.java b/...lucoenergia/conluz/domain/consumption/datadis/sync/DatadisConsumptionSyncServiceTest.java
@@ -61,6 +61,10 @@ void testSynchronizeConsumptionsValidDateFromNull() {
         Supply supplyWithMoreThanOneYearValidDateFrom = SupplyMother.random()
                 .withDatadisValidDateFrom(LocalDate.now().minusMonths(24)).build();
         supplyWithMoreThanOneYearValidDateFrom = createSupplyRepository.create(supplyWithMoreThanOneYearValidDateFrom, UserId.of(user.getId()));
+        Supply supplyWithoutDistributorCode = SupplyMother.random()
+                .withDatadisDistributorCode(null)
+                .withDatadisValidDateFrom(LocalDate.now().minusMonths(24)).build();
+        supplyWithoutDistributorCode = createSupplyRepository.create(supplyWithoutDistributorCode, UserId.of(user.getId()));
 
         List<DatadisConsumption> consumptions = List.of(mock(DatadisConsumption.class));
         when(getDatadisConsumptionRepository.getHourlyConsumptionsByMonth(any(Supply.class), any(Month.class), anyInt()))
@@ -76,6 +80,8 @@ void testSynchronizeConsumptionsValidDateFromNull() {
                 .getHourlyConsumptionsByMonth(eq(supplyWithNotNullValidDateFrom), any(Month.class), anyInt());
         verify(getDatadisConsumptionRepository, times(12))
                 .getHourlyConsumptionsByMonth(eq(supplyWithMoreThanOneYearValidDateFrom), any(Month.class), anyInt());
+        verify(getDatadisConsumptionRepository, times(0))
+                .getHourlyConsumptionsByMonth(eq(supplyWithoutDistributorCode), any(Month.class), anyInt());
         verify(persistDatadisConsumptionRepository, times(21)).persistConsumptions(anyList());
     }
 }