Merge branch 'subscriptions-2020' into UNIONVMS-MOVEMENT-RULES

Author: nomikosi

model/src/main/resources/contract/Template.xsd

@@ -89,7 +89,6 @@
             <!-- Movements -->
             <xsd:enumeration value="MOVEMENT_REPORT_DOCUMENT"/>
             <xsd:enumeration value="MOVEMENT_REPORT_DOCUMENT_ID"/>
-
         </xsd:restriction>
     </xsd:simpleType>
 </xsd:schema>

service/src/main/java/eu/europa/ec/fisheries/uvms/rules/service/bean/ContainerType.java

@@ -47,9 +47,7 @@ public enum ContainerType {
             FactType.SALES_VALIDATION_RESULT_DOCUMENT, FactType.SALES_VALIDATION_QUALITY_ANALYSIS,FactType.SALES_REPORT_WRAPPER,
             FactType.SALES_AUCTION_SALE, FactType.SALES_FLUX_SALES_QUERY_MESSAGE, FactType.SALES_QUERY_PARAMETER, FactType.SALES_FLUX_SALES_RESPONSE_MESSAGE),
 
-    MOVEMENTS("movement","ec.europa.eu.movement", FactType.MOVEMENT_REPORT_DOCUMENT, FactType.MOVEMENT_REPORT_DOCUMENT_ID
-
-    );
+    MOVEMENTS("movement","ec.europa.eu.movement", FactType.MOVEMENT_REPORT_DOCUMENT, FactType.MOVEMENT_REPORT_DOCUMENT_ID);
 
     private final String packageName;
     private final String containerName;

service/src/main/java/eu/europa/ec/fisheries/uvms/rules/service/bean/movement/RulesMovementProcessorBean.java

@@ -878,15 +878,19 @@ public List<String> call() {
     }
 
     // Todo ; When possible remove loop!
-    private List<MovementFact> collectBatchMovementData(List<MobileTerminalType> mobileTerminal, List<Asset> asset, List<RawMovementType> rawMovement, String username) {
+    private List<MovementFact> collectBatchMovementData(List<MobileTerminalType> mobileTerminal, List<Asset> asset, List<RawMovementType> rawMovement, String username) throws MessageException {
         List<MovementFact> movFactList = new ArrayList<>();
         int index = 0;
         for (RawMovementType rawMovementType : rawMovement) {
             try {
                 movFactList.add(collectMovementData(mobileTerminal.get(index), asset.get(index), rawMovementType, username));
-            } catch (ExecutionException | InterruptedException | RulesServiceException e) {
-                movFactList.add(null);
+            }
+            catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
+                throw new MessageException("Thread interrupted...",e);
+            }
+            catch (ExecutionException | RulesServiceException e) {
+                movFactList.add(null);
             }
         }
         return movFactList;

service/src/main/java/eu/europa/ec/fisheries/uvms/rules/service/business/generator/MovementFactGenerator.java

@@ -23,6 +23,7 @@ This file is part of the Integrated Fisheries Data Management (IFDM) Suite. The
 import java.util.List;
 
 import static eu.europa.ec.fisheries.uvms.rules.service.config.ExtraValueType.DATA_FLOW;
+import static eu.europa.ec.fisheries.uvms.rules.service.constants.XPathConstants.MOVEMENT_REPORT_DOCUMENT;
 
 public class MovementFactGenerator extends AbstractGenerator {
 

service/src/main/java/eu/europa/ec/fisheries/uvms/rules/service/mapper/fact/MovementReportDocumentFactMapper.java

@@ -25,6 +25,8 @@ This file is part of the Integrated Fisheries Data Management (IFDM) Suite. The
 import java.util.Date;
 import java.util.List;
 
+import java.util.Date;
+
 import static eu.europa.ec.fisheries.uvms.rules.service.constants.XPathConstants.CREATION_DATE_TIME;
 import static eu.europa.ec.fisheries.uvms.rules.service.constants.XPathConstants.FLUX_REPORT_DOCUMENT;
 import static eu.europa.ec.fisheries.uvms.rules.service.constants.XPathConstants.MOVEMENT_REPORT_DOCUMENT;
@@ -33,9 +35,9 @@ This file is part of the Integrated Fisheries Data Management (IFDM) Suite. The
 public class MovementReportDocumentFactMapper {
 
     private XPathStringWrapper xPathUtil;
-
     public static final String ID = "id";
 
+
     public MovementReportDocumentFactMapper() {
         xPathUtil = new XPathStringWrapper();
     }

service/src/test/java/eu/europa/ec/fisheries/uvms/rules/service/bean/movement/RulesMovementProcessorBeanTest.java

@@ -22,6 +22,7 @@ This file is part of the Integrated Fisheries Data Management (IFDM) Suite. The
 import eu.europa.ec.fisheries.schema.rules.exchange.v1.PluginType;
 import eu.europa.ec.fisheries.schema.rules.module.v1.SetFLUXMovementReportRequest;
 import eu.europa.ec.fisheries.schema.rules.previous.v1.PreviousReportType;
+import eu.europa.ec.fisheries.schema.rules.rule.v1.RawMsgType;
 import eu.europa.ec.fisheries.schema.rules.search.v1.AlarmQuery;
 import eu.europa.ec.fisheries.schema.rules.search.v1.TicketQuery;
 import eu.europa.ec.fisheries.schema.rules.source.v1.GetAlarmListByQueryResponse;
@@ -42,8 +43,11 @@ This file is part of the Integrated Fisheries Data Management (IFDM) Suite. The
 import eu.europa.ec.fisheries.uvms.rules.model.dto.TicketListResponseDto;
 import eu.europa.ec.fisheries.uvms.rules.model.mapper.RulesDataSourceRequestMapper;
 import eu.europa.ec.fisheries.uvms.rules.model.mapper.RulesDataSourceResponseMapper;
+import eu.europa.ec.fisheries.uvms.rules.service.bean.RulePostProcessBean;
+import eu.europa.ec.fisheries.uvms.rules.service.bean.RulesEngineBean;
 import eu.europa.ec.fisheries.uvms.rules.service.bean.mdr.MDRCache;
 import eu.europa.ec.fisheries.uvms.rules.service.business.PreviousReportFact;
+import eu.europa.ec.fisheries.uvms.rules.service.business.ValidationResult;
 import eu.europa.ec.fisheries.uvms.rules.service.constants.MDRAcronymType;
 import eu.europa.ec.fisheries.uvms.rules.service.constants.ServiceConstants;
 import org.junit.Before;
@@ -60,9 +64,11 @@ This file is part of the Integrated Fisheries Data Management (IFDM) Suite. The
 import un.unece.uncefact.data.standard.fluxvesselpositionmessage._4.FLUXVesselPositionMessage;
 import un.unece.uncefact.data.standard.mdr.communication.ColumnDataType;
 import un.unece.uncefact.data.standard.mdr.communication.ObjectRepresentation;
+import un.unece.uncefact.data.standard.reusableaggregatebusinessinformationentity._18.FLUXReportDocumentType;
 import un.unece.uncefact.data.standard.reusableaggregatebusinessinformationentity._18.VesselPositionEventType;
 import un.unece.uncefact.data.standard.reusableaggregatebusinessinformationentity._18.VesselTransportMeansType;
 import un.unece.uncefact.data.standard.unqualifieddatatype._18.CodeType;
+import un.unece.uncefact.data.standard.unqualifieddatatype._18.IDType;
 
 import javax.enterprise.event.Event;
 import javax.jms.JMSException;
@@ -89,6 +95,7 @@ This file is part of the Integrated Fisheries Data Management (IFDM) Suite. The
 public class RulesMovementProcessorBeanTest {
 
     private static final String USERNAME = "USERNAME";
+    private static final String FLUX_REPORT_DOC_UUID = UUID.randomUUID().toString();
 
     @Mock
     RulesMessageProducer mockProducer;
@@ -112,6 +119,10 @@ public class RulesMovementProcessorBeanTest {
     MDRCache mdrCache;
     @Mock
     RulesExchangeProducerBean exchangeProducer;
+    @Mock
+    RulesEngineBean rulesEngine;
+    @Mock
+    RulePostProcessBean rulePostProcessBean;
 
     @InjectMocks
     RulesMovementProcessorBean rulesMovementProcessorBean;
@@ -546,6 +557,9 @@ public void testSetMovementReportReceived() throws Exception {
         setupMobileTerminalConversation();
         setupMovementModuleConversation();
         String messageGuid = UUID.randomUUID().toString();
+        ValidationResult validationResult = new ValidationResult();
+        validationResult.setError(false);
+        when(rulePostProcessBean.checkAndUpdateValidationResult(any(), anyString(), anyString(), eq(RawMsgType.MOVEMENT))).thenReturn(validationResult);
 
         rulesMovementProcessorBean.setMovementReportReceived(request, messageGuid);
 
@@ -577,6 +591,12 @@ private void setupFluxVesselPositionMessage(SetFLUXMovementReportRequest request
         vesselPositionEvent.setTypeCode(new CodeType());
         vesselPositionEvent.getTypeCode().setValue("MANUAL");
         vesselTransportMeans.getSpecifiedVesselPositionEvents().add(vesselPositionEvent);
+        FLUXReportDocumentType fluxReportDoc = new FLUXReportDocumentType();
+        final IDType id = new IDType();
+        id.setSchemeID("UUID");
+        id.setValue(FLUX_REPORT_DOC_UUID);
+        fluxReportDoc.getIDS().add(id);
+        fluxVesselPositionMessage.setFLUXReportDocument(fluxReportDoc);
         request.setRequest(JAXBUtils.marshallJaxBObjectToString(fluxVesselPositionMessage, "UTF-8", true));
     }