Update of EI Data Producer API

[nonrtric.git] / enrichment-coordinator-service / src / main / java / org / oransc / enrichment / controllers / consumer / ConsumerController.java

diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java
index 6e9438d..8267b6a 100644 (file)
--- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java
+++ b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java
@@ -30,8 +30,8 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 import org.everit.json.schema.Schema;
@@ -44,10 +44,11 @@ import org.oransc.enrichment.controllers.producer.ProducerCallbacks;
 import org.oransc.enrichment.exceptions.ServiceException;
 import org.oransc.enrichment.repository.EiJob;
 import org.oransc.enrichment.repository.EiJobs;
-import org.oransc.enrichment.repository.EiProducer;
 import org.oransc.enrichment.repository.EiProducers;
 import org.oransc.enrichment.repository.EiType;
 import org.oransc.enrichment.repository.EiTypes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -68,6 +69,8 @@ import reactor.core.publisher.Mono;
 @RequestMapping(path = ConsumerConsts.API_ROOT, produces = MediaType.APPLICATION_JSON_VALUE)
 public class ConsumerController {
 
+    private final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
     @Autowired
     ApplicationConfig applicationConfig;
 
@@ -208,16 +211,11 @@ public class ConsumerController {
         }
     }
 
-    private Collection<EiProducer> getProducers(EiJob eiJob) {
-        return this.eiProducers.getProducersForType(eiJob.getTypeId());
-    }
-
     private ConsumerEiJobStatus toEiJobStatus(EiJob job) {
-        if (getProducers(job).isEmpty()) {
-            return new ConsumerEiJobStatus(ConsumerEiJobStatus.EiJobStatusValues.DISABLED);
-        } else {
-            return new ConsumerEiJobStatus(ConsumerEiJobStatus.EiJobStatusValues.ENABLED);
-        }
+        return this.eiProducers.isJobEnabled(job)
+            ? new ConsumerEiJobStatus(ConsumerEiJobStatus.EiJobStatusValues.ENABLED)
+            : new ConsumerEiJobStatus(ConsumerEiJobStatus.EiJobStatusValues.DISABLED);
+
     }
 
     @DeleteMapping(path = "/eijobs/{eiJobId}", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -269,13 +267,9 @@ public class ConsumerController {
 
     private Mono<EiJob> startEiJob(EiJob newEiJob) {
         return this.producerCallbacks.startEiJob(newEiJob, eiProducers) //
-            .flatMap(noOfAcceptingProducers -> {
-                if (noOfAcceptingProducers.intValue() > 0) {
-                    return Mono.just(newEiJob);
-                } else {
-                    return Mono.error(new ServiceException("Job not accepted by any producers", HttpStatus.CONFLICT));
-                }
-            });
+            .doOnNext(noOfAcceptingProducers -> this.logger.debug(
+                "Started EI job {}, number of activated producers: {}", newEiJob.getId(), noOfAcceptingProducers)) //
+            .flatMap(noOfAcceptingProducers -> Mono.just(newEiJob));
     }
 
     private Mono<EiJob> validatePutEiJob(String eiJobId, ConsumerEiJobInfo eiJobInfo) {