HLM-5117 Removing unnecessary integrations

health-services/plan-service/pom.xml

@@ -117,9 +117,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.egov.common</groupId>
-            <artifactId>health-services-common</artifactId>
-            <version>1.0.15-SNAPSHOT</version>
+            <groupId>org.egov.services</groupId>
+            <artifactId>digit-models</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

health-services/plan-service/src/main/java/digit/config/ServiceConstants.java

@@ -46,5 +46,6 @@ public class ServiceConstants {
     public static final String TENANTID = "?tenantId=";
     public static final String BUSINESS_SERVICES = "&businessServices=";
 
-
+    public static final String USERINFO_MISSING_CODE = "USERINFO_MISSING";
+    public static final String USERINFO_MISSING_MESSAGE = "UserInfo is missing in Request Info ";
 }

health-services/plan-service/src/main/java/digit/service/PlanConfigurationService.java

@@ -2,11 +2,11 @@
 
 import digit.config.Configuration;
 import digit.kafka.Producer;
-import digit.validators.PlanConfigurationValidator;
+import digit.service.enrichment.EnrichmentService;
+import digit.service.validator.PlanConfigurationValidator;
 import digit.web.models.PlanConfigurationRequest;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -32,6 +32,6 @@ public PlanConfigurationRequest create(PlanConfigurationRequest request) {
         enrichmentService.enrichCreate(request);
         validator.validateCreate(request);
         producer.push(config.getPlanConfigCreateTopic() ,request);
-        return new PlanConfigurationRequest();
+        return request;
     }
 }

health-services/plan-service/src/main/java/digit/service/EnrichmentService.java → health-services/plan-service/src/main/java/digit/service/enrichment/EnrichmentService.java

@@ -1,16 +1,22 @@
-package digit.service;
+package digit.service.enrichment;
 
 import digit.config.Configuration;
 import digit.models.coremodels.AuditDetails;
 import digit.web.models.Assumption;
+import digit.web.models.File;
 import digit.web.models.Operation;
 import digit.web.models.PlanConfiguration;
 import digit.web.models.PlanConfigurationRequest;
+import digit.web.models.ResourceMapping;
 import java.util.List;
 import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
+import org.egov.tracer.model.CustomException;
 import org.springframework.stereotype.Service;
 
+import static digit.config.ServiceConstants.USERINFO_MISSING_CODE;
+import static digit.config.ServiceConstants.USERINFO_MISSING_MESSAGE;
+
 
 @Service
 @Slf4j
@@ -23,7 +29,10 @@ public EnrichmentService(Configuration config) {
 
     public void enrichCreate(PlanConfigurationRequest request)  {
         enrichPlanConfiguration(request.getPlanConfiguration());
+        if(request.getRequestInfo().getUserInfo() == null)
+            throw new CustomException(USERINFO_MISSING_CODE, USERINFO_MISSING_MESSAGE);
 
+        enrichAuditDetails(request.getPlanConfiguration(), request.getRequestInfo().getUserInfo().getUuid(), Boolean.TRUE);
     }
 
     public PlanConfiguration enrichPlanConfiguration(PlanConfiguration planConfiguration) {
@@ -47,6 +56,25 @@ public PlanConfiguration enrichPlanConfiguration(PlanConfiguration planConfigura
         return planConfiguration;
     }
 
+    public void enrichAuditDetails(PlanConfiguration planConfiguration, String by, Boolean isCreate) {
+        Long time = System.currentTimeMillis();
+        for (Operation operation : planConfiguration.getOperations()) {
+            operation.setAuditDetails(getAuditDetails(by, operation.getAuditDetails(), isCreate));
+        }
+
+        for (Assumption assumption : planConfiguration.getAssumptions()) {
+            assumption.setAuditDetails(getAuditDetails(by, assumption.getAuditDetails(), isCreate));
+        }
+
+        for (File file : planConfiguration.getFiles()) {
+            file.setAuditDetails(getAuditDetails(by, file.getAuditDetails(), isCreate));
+        }
+
+        for (ResourceMapping resourceMapping : planConfiguration.getResourceMapping()) {
+            resourceMapping.setAuditDetails(getAuditDetails(by, resourceMapping.getAuditDetails(), isCreate));
+        }
+    }
+
     public AuditDetails getAuditDetails(String by, AuditDetails auditDetails, Boolean isCreate) {
         Long time = System.currentTimeMillis();
         if (isCreate)

health-services/plan-service/src/main/java/digit/validators/PlanConfigurationValidator.java → health-services/plan-service/src/main/java/digit/service/validator/PlanConfigurationValidator.java

@@ -1,4 +1,4 @@
-package digit.validators;
+package digit.service.validator;
 
 import digit.web.models.PlanConfigurationRequest;
 import lombok.extern.slf4j.Slf4j;

health-services/plan-service/src/main/java/digit/web/models/Assumption.java

@@ -3,8 +3,7 @@
 import digit.models.coremodels.AuditDetails;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import io.swagger.v3.oas.annotations.media.Schema;
+
 import java.math.BigDecimal;
 import java.util.UUID;
 import org.springframework.validation.annotation.Validated;

health-services/plan-service/src/main/java/digit/web/models/PlanConfiguration.java

@@ -1,14 +1,7 @@
 package digit.web.models;
 
 import digit.models.coremodels.AuditDetails;
-import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import digit.web.models.Assumption;
-import digit.web.models.Operation;
-import digit.web.models.ResourceMapping;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;