Merge pull request #66 from dcsaorg/DDT-1385-remove-reefers

DDT-1385 removed reefers for publication

Author: pimg

.github/workflows/master.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - master
+      - Publication**
 
 jobs:
   build:

edocumentation-service/src/main/java/org/dcsa/edocumentation/service/RequestedEquipmentGroupService.java

@@ -51,7 +51,7 @@ public void createRequestedEquipments(
           requestedEquipmentGroupMapper.toDAO(
             re,
             booking,
-            activeReeferSettingsService.createBookingActiveReeferSettings(re.activeReeferSettings()),
+            activeReeferSettingsService.createBookingActiveReeferSettings(null),
             links
           )
         );

edocumentation-service/src/main/java/org/dcsa/edocumentation/service/UtilizedTransportEquipmentService.java

@@ -20,10 +20,8 @@
 public class UtilizedTransportEquipmentService {
 
   private final EquipmentService equipmentService;
-  private final ActiveReeferSettingsService activeReeferSettingsService;
 
   private final UtilizedTransportEquipmentRepository utilizedTransportEquipmentRepository;
-  private final RequestedEquipmentGroupRepository requestedEquipmentGroupRepository;
 
   private final UtilizedTransportEquipmentMapper utilizedTransportEquipmentMapper;
 
@@ -36,7 +34,7 @@ public Map<String, UtilizedTransportEquipment> createUtilizedTransportEquipment(
     return utilizedTransportEquipmentRepository
         .saveAll(
             utilizedTransportEquipmentTOs.stream()
-                .map(ute -> utilizedTransportEquipmentMapper.toDAO(ute, createRequestedEquipmentGroup(ute)))
+                .map(ute -> utilizedTransportEquipmentMapper.toDAO(ute, null))
                 .toList())
         .stream()
         .collect(
@@ -46,17 +44,4 @@ public Map<String, UtilizedTransportEquipment> createUtilizedTransportEquipment(
                 utilizedTransportEquipment -> utilizedTransportEquipment));
   }
 
-  private RequestedEquipmentGroup createRequestedEquipmentGroup(UtilizedTransportEquipmentTO uteTO) {
-    if (uteTO == null || uteTO.activeReeferSettings() == null) {
-      return null;
-    }
-
-    return requestedEquipmentGroupRepository.save(
-      RequestedEquipmentGroup.builder()
-        .confirmedEquipmentIsoEquipmentCode(uteTO.equipment().isoEquipmentCode())
-        .confirmedEquipmentUnits(uteTO.equipment().isoEquipmentCode() != null ? 1 : null)
-        .isShipperOwned(uteTO.isShipperOwned())
-        .activeReeferSettings(activeReeferSettingsService.createShippingInstructionActiveReeferSettings(uteTO.activeReeferSettings()))
-        .build());
-  }
 }

edocumentation-service/src/main/java/org/dcsa/edocumentation/service/mapping/RequestedEquipmentGroupMapper.java

@@ -21,7 +21,6 @@
 public interface RequestedEquipmentGroupMapper {
   @Mapping(source = "booking", target = "booking")
   @Mapping(source = "booking.id", target = "id", ignore = true)
-  @Mapping(source = "activeReeferSettings", target = "activeReeferSettings")
   @Mapping(source = "requestedEquipment.isoEquipmentCode", target = "requestedEquipmentIsoEquipmentCode")
   @Mapping(source = "requestedEquipment.units", target = "requestedEquipmentUnits")
   @Mapping(expression = "java(mapCommodityRequestedEquipmentLink(links, requestedEquipment.commodityRequestedEquipmentLink()))", target = "commodityRequestedEquipmentLink")
@@ -41,7 +40,6 @@ default CommodityRequestedEquipmentLink mapCommodityRequestedEquipmentLink(
   @Mapping(source = "requestedEquipmentUnits", target = "units")
   @Mapping(source = "requestedEquipmentIsoEquipmentCode", target = "isoEquipmentCode")
   @Mapping(source = "requestedEquipment.commodityRequestedEquipmentLink.commodityRequestedEquipmentLink", target = "commodityRequestedEquipmentLink")
-  @Mapping(target = "activeReeferSettings", qualifiedByName = "toBookingActiveReeferSettingsTO")
   RequestedEquipmentTO toTO(RequestedEquipmentGroup requestedEquipment);
 
   default String mapEquipmentToEquipmentReference(Equipment equipment) {

edocumentation-service/src/main/java/org/dcsa/edocumentation/service/mapping/UtilizedTransportEquipmentMapper.java

@@ -18,6 +18,5 @@ public interface UtilizedTransportEquipmentMapper {
   @Mapping(source = "requestedEquipmentGroup.id", target = "id", ignore = true)
   UtilizedTransportEquipment toDAO(UtilizedTransportEquipmentTO utilizedTransportEquipmentTO, RequestedEquipmentGroup requestedEquipmentGroup);
 
-  @Mapping(source = "utilizedTransportEquipment.requestedEquipmentGroup.activeReeferSettings", target = "activeReeferSettings", qualifiedByName = "toShippingInstructionActiveReeferSettingsTO")
   UtilizedTransportEquipmentTO toDTO(UtilizedTransportEquipment utilizedTransportEquipment);
 }

edocumentation-service/src/test/java/org/dcsa/edocumentation/datafactories/RequestedEquipmentDataFactory.java

@@ -30,7 +30,6 @@ public static RequestedEquipmentTO requestedEquipmentTORef1() {
       .isoEquipmentCode("GP22")
       .units(1)
       .isShipperOwned(true)
-      .activeReeferSettings(BookingActiveReeferSettingsDataFactory.bkgFreezer())
       .build();
   }
 

edocumentation-service/src/test/java/org/dcsa/edocumentation/service/BookingServiceTest.java

@@ -62,7 +62,6 @@ class GetBooking {
     @Spy private AddressMapper addressMapper = Mappers.getMapper(AddressMapper.class);
     @Spy private RequestedEquipmentGroupMapper requestedEquipmentGroupMapper = Mappers.getMapper(RequestedEquipmentGroupMapper.class);
     @Spy private CommodityRequestedEquipmentLinkMapper commodityRequestedEquipmentLinkMapper = new CommodityRequestedEquipmentLinkMapper();
-    @Spy private ActiveReeferSettingsMapper activeReeferSettingsMapper = Mappers.getMapper(ActiveReeferSettingsMapper.class);
 
     @InjectMocks private BookingService service;
 
@@ -74,7 +73,6 @@ void setupMappers() {
       ReflectionTestUtils.setField(bookingMapper, "displayedAddressMapper", displayedAddressMapper);
       ReflectionTestUtils.setField(bookingMapper, "requestedEquipmentGroupMapper", requestedEquipmentGroupMapper);
       ReflectionTestUtils.setField(bookingMapper, "commodityRequestedEquipmentLinkMapper", commodityRequestedEquipmentLinkMapper);
-      ReflectionTestUtils.setField(requestedEquipmentGroupMapper, "activeReeferSettingsMapper", activeReeferSettingsMapper);
     }
 
     @Test

edocumentation-service/src/test/java/org/dcsa/edocumentation/service/RequestedEquipmentGroupServiceTest.java

@@ -78,7 +78,7 @@ public void testCreate_WithEquipmentReferences() {
     // Verify
     verify(equipmentService).resolveEquipments(eq(List.of(requestedEquipmentTO)), any(), any());
     verify(requestedEquipmentGroupRepository).save(expectedGroup);
-    verify(activeReeferSettingsService).createBookingActiveReeferSettings(requestedEquipmentTO.activeReeferSettings());
+    verify(activeReeferSettingsService).createBookingActiveReeferSettings(null);
     verify(utilizedTransportEquipmentRepository).saveAll(any());
   }
 }

edocumentation-transfer-obj/src/main/java/org/dcsa/edocumentation/transferobjects/RequestedEquipmentTO.java

@@ -27,9 +27,8 @@ public record RequestedEquipmentTO(
   Boolean isShipperOwned,
 
   @Size(max = 100)
-  String commodityRequestedEquipmentLink,
+  String commodityRequestedEquipmentLink
 
-  BookingActiveReeferSettingsTO activeReeferSettings
 ) {
   @Builder(toBuilder = true)
   public RequestedEquipmentTO { }

edocumentation-transfer-obj/src/main/java/org/dcsa/edocumentation/transferobjects/UtilizedTransportEquipmentTO.java

@@ -32,10 +32,7 @@ public record UtilizedTransportEquipmentTO(
   Boolean isShipperOwned,
 
   @Valid
-  List<SealTO> seals,
-
-  @Valid
-  ShippingInstructionActiveReeferSettingsTO activeReeferSettings
+  List<SealTO> seals
 ) {
   @Builder
   public UtilizedTransportEquipmentTO{}