[airavata] branch develop updated: Automatically add CREATED status to new Process

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new e1e6bf8  Automatically add CREATED status to new Process
e1e6bf8 is described below

commit e1e6bf872903c5226e579ee9a993f2d2c712a363
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jun 11 17:08:44 2019 -0400

    Automatically add CREATED status to new Process
    
    This is inline with the older ExperimentRegistry code.
    See https://github.com/apache/airavata/blob/cc35ce9b49c94c921e0c6c4d95ac75b41a6515f0/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java#L313-L317
---
 .../core/repositories/expcatalog/ProcessRepository.java        |  5 +++++
 .../core/repositories/expcatalog/ProcessRepositoryTest.java    | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepository.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepository.java
index 731133f..833e8ce 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepository.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepository.java
@@ -23,6 +23,8 @@ package org.apache.airavata.registry.core.repositories.expcatalog;
 import org.apache.airavata.model.commons.airavata_commonsConstants;
 import org.apache.airavata.model.process.ProcessModel;
 import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
+import org.apache.airavata.model.status.ProcessState;
+import org.apache.airavata.model.status.ProcessStatus;
 import org.apache.airavata.registry.core.entities.expcatalog.ProcessEntity;
 import org.apache.airavata.registry.core.utils.DBConstants;
 import org.apache.airavata.registry.core.utils.ExpCatalogUtils;
@@ -119,6 +121,9 @@ public class ProcessRepository extends ExpCatAbstractRepository<ProcessModel, Pr
 
     public String addProcess(ProcessModel process, String experimentId) throws RegistryException {
         process.setExperimentId(experimentId);
+
+        ProcessStatus processStatus = new ProcessStatus(ProcessState.CREATED);
+        process.addToProcessStatuses(processStatus);
         String processId = saveProcessModelData(process);
         return processId;
     }
diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepositoryTest.java
index 4fcee4e..c859636 100644
--- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepositoryTest.java
+++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepositoryTest.java
@@ -83,9 +83,9 @@ public class ProcessRepositoryTest extends TestBase {
         String experimentId = experimentRepository.addExperiment(experimentModel);
 
         ProcessModel processModel = new ProcessModel(null, experimentId);
-        ProcessStatus processStatus = new ProcessStatus();
-        processStatus.setState(ProcessState.CREATED);
-        processModel.addToProcessStatuses(processStatus);
+        // ProcessStatus processStatus = new ProcessStatus();
+        // processStatus.setState(ProcessState.CREATED);
+        // processModel.addToProcessStatuses(processStatus);
 
         TaskModel task = new TaskModel();
         task.setTaskId("task-id");
@@ -121,8 +121,8 @@ public class ProcessRepositoryTest extends TestBase {
         assertEquals(experimentId, retrievedProcess.getExperimentId());
         assertEquals("detail", retrievedProcess.getProcessDetail());
         assertTrue(retrievedProcess.isUseUserCRPref());
-        assertEquals(1, retrievedProcess.getProcessStatusesSize());
-        assertEquals(ProcessState.CREATED, retrievedProcess.getProcessStatuses().get(0).getState());
+        assertEquals("Added process should automatically have 1 status", 1, retrievedProcess.getProcessStatusesSize());
+        assertEquals("Added process should automatically have 1 status that is CREATED", ProcessState.CREATED, retrievedProcess.getProcessStatuses().get(0).getState());
         assertEquals(2, retrievedProcess.getTasksSize());
 
         ComputationalResourceSchedulingModel computationalResourceSchedulingModel = new ComputationalResourceSchedulingModel();