services -> service

src/main/java/fr/insee/knowledge/constants/Constants.java

@@ -29,7 +29,7 @@ private Constants() {
     public static final String idProductFiled = "products";
     public static final String gsbpmField = "gsbpm";
     public static final String labelField = "label";
-    public static final String serviceField = "services";
+    public static final String serviceField = "service";
     public static final String descriptionField = "description";
     public static final String dispoField = "dispo";
     public static final String tasksField = "tasks";

src/main/java/fr/insee/knowledge/domain/Function.java

@@ -10,10 +10,9 @@ public class Function extends GenericIDLabel {
     private List<GenericIDLabel> users;
     private List<ProductOrGsbpm> products;
     private List<Task> tasks;
+    private Service service;
 
-    private Services servicesBpmn;
-
-    public Function(String id, String label, String description, int dispo, ProductOrGsbpm gsbpm, String idProduct, List<GenericIDLabel> users, List<ProductOrGsbpm> tools, List<Task> tasks, Services servicesBpmn) {
+    public Function(String id, String label, String description, int dispo, ProductOrGsbpm gsbpm, String idProduct, List<GenericIDLabel> users, List<ProductOrGsbpm> tools, List<Task> tasks, Service service) {
         super(id, label);
         this.description = description;
         this.dispo = dispo;
@@ -22,7 +21,7 @@ public Function(String id, String label, String description, int dispo, ProductO
         this.users = users;
         this.products = products;
         this.tasks = tasks;
-        this.servicesBpmn = servicesBpmn;
+        this.service = service;
     }
 
     public Function() {
@@ -85,11 +84,11 @@ public void setTasks(List<Task> tasks) {
         this.tasks = tasks;
     }
 
-    public Services getServiceBpmn() {
-        return servicesBpmn;
+    public Service getService() {
+        return service;
     }
 
-    public void setServiceBpmn(Services services) {
-        this.servicesBpmn = services;
+    public void setService(Service service) {
+        this.service = service;
     }
 }

src/main/java/fr/insee/knowledge/domain/Service.java

@@ -0,0 +1,33 @@
+package fr.insee.knowledge.domain;
+
+public class Service extends GenericIDLabel {
+
+    private Service service;
+    private String description;
+
+    public Service(Service service, String description, String id, String label) {
+        super(id, label);
+        this.service = service;
+        this.description = description;
+    }
+
+    public Service() {
+    }
+
+    public Service getService() {
+        return service;
+    }
+
+    public void setService(Service service) {
+        this.service = service;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+}

src/main/java/fr/insee/knowledge/service/impl/ImportFunctionServiceImpl.java

@@ -6,7 +6,7 @@
 import fr.insee.knowledge.constants.Constants;
 import fr.insee.knowledge.dao.FunctionDAO;
 import fr.insee.knowledge.domain.Function;
-import fr.insee.knowledge.domain.Services;
+import fr.insee.knowledge.domain.Service;
 import fr.insee.knowledge.service.ImportFunctionService;
 
 import java.io.IOException;
@@ -37,31 +37,31 @@ private List<Function> getListFunctionsFromJsonNode(JsonNode rootNode) throws Js
         List<Function> listFunction = new ArrayList<>();
         if (rootNode.isArray()) {
             for (JsonNode node : rootNode) {
-                recursiveMapping(listFunction, node, new Services());
+                recursiveMapping(listFunction, node, new Service());
             }
         }
         return listFunction;
     }
 
-    private void recursiveMapping(List<Function> functionList, JsonNode jsonNode, Services currentServices) throws JsonProcessingException {
-        currentServices.setId(jsonNode.get(Constants.idField).asText());
-        currentServices.setLabel(jsonNode.get(Constants.labelField).asText());
+    private void recursiveMapping(List<Function> functionList, JsonNode jsonNode, Service currentService) throws JsonProcessingException {
+        currentService.setId(jsonNode.get(Constants.idField).asText());
+        currentService.setLabel(jsonNode.get(Constants.labelField).asText());
 
         JsonNode functionNodeArray = jsonNode.get(Constants.functionField);
         if (functionNodeArray != null) {
             for (JsonNode functionNode : functionNodeArray) {
                 Function function = mapper.treeToValue(functionNode, Function.class);
-                function.setServiceBpmn(currentServices);
+                function.setService(currentService);
                 functionList.add(function);
             }
         }
         JsonNode node = jsonNode.get(Constants.serviceField);
         if (node != null) {
             for (JsonNode serviceNode : node) {
-                Services services = new Services();
+                Service service = new Service();
                 //TODO test if service exist in database
-                services.setService(currentServices);
-                recursiveMapping(functionList, serviceNode, services);
+                service.setService(currentService);
+                recursiveMapping(functionList, serviceNode, service);
             }
         }
     }

src/main/resources/schema/schemaFunctions.json

@@ -11,7 +11,7 @@
       "users",
       "products",
       "tasks",
-      "serviceBpmn"
+      "services"
     ],
     "properties": {
       "_id": {
@@ -107,7 +107,7 @@
           }
         }
       },
-      "serviceBpmn": {
+      "services": {
         "bsonType": "object",
         "items": {
           "bsonType": "object",
@@ -122,7 +122,7 @@
             "label": {
               "bsonType": "string"
             },
-            "serviceBpmn": {
+            "services": {
               "bsonType": "object"
             }
           }