Merge branch 'plan-workflow-status'

src/main/java/org/opencdmp/commonmodels/models/description/DescriptionModel.java

@@ -1,7 +1,6 @@
 package org.opencdmp.commonmodels.models.description;
 
 
-import org.opencdmp.commonmodels.enums.DescriptionStatus;
 import org.opencdmp.commonmodels.models.plan.PlanModel;
 import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
 
@@ -14,7 +13,7 @@ public class DescriptionModel {
     private String label;
     private String description;
     private List<String> tags;
-    private DescriptionStatus status;
+    private DescriptionStatusModel status;
     private DescriptionTemplateModel descriptionTemplate;
     private PlanModel plan;
     private UUID sectionId;
@@ -80,11 +79,11 @@ public class DescriptionModel {
         this.plan = plan;
     }
 
-    public DescriptionStatus getStatus() {
+    public DescriptionStatusModel getStatus() {
         return status;
     }
 
-    public void setStatus(DescriptionStatus status) {
+    public void setStatus(DescriptionStatusModel status) {
         this.status = status;
     }
 

src/main/java/org/opencdmp/commonmodels/models/description/DescriptionStatusModel.java

@@ -0,0 +1,36 @@
+package org.opencdmp.commonmodels.models.description;
+
+import java.util.UUID;
+
+public class DescriptionStatusModel {
+
+    private UUID id;
+
+    private String name;
+
+    private org.opencdmp.commonmodels.enums.DescriptionStatus internalStatus;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public org.opencdmp.commonmodels.enums.DescriptionStatus getInternalStatus() {
+        return internalStatus;
+    }
+
+    public void setInternalStatus(org.opencdmp.commonmodels.enums.DescriptionStatus internalStatus) {
+        this.internalStatus = internalStatus;
+    }
+}

src/main/java/org/opencdmp/commonmodels/models/plan/PlanModel.java

@@ -1,7 +1,6 @@
 package org.opencdmp.commonmodels.models.plan;
 
 import org.opencdmp.commonmodels.enums.PlanAccessType;
-import org.opencdmp.commonmodels.enums.PlanStatus;
 import org.opencdmp.commonmodels.models.PlanUserModel;
 import org.opencdmp.commonmodels.models.EntityDoiModel;
 import org.opencdmp.commonmodels.models.FileEnvelopeModel;
@@ -21,7 +20,7 @@ public class PlanModel {
     private String label;
     private String description;
     private PlanAccessType accessType;
-    private PlanStatus status;
+    private PlanStatusModel status;
     private UserModel creator;
     private PlanBlueprintModel planBlueprint;
     private PlanPropertiesModel properties;
@@ -144,11 +143,11 @@ public class PlanModel {
         this.descriptions = descriptions;
     }
 
-    public PlanStatus getStatus() {
+    public PlanStatusModel getStatus() {
         return status;
     }
 
-    public void setStatus(PlanStatus status) {
+    public void setStatus(PlanStatusModel status) {
         this.status = status;
     }
 

src/main/java/org/opencdmp/commonmodels/models/plan/PlanStatusModel.java

@@ -0,0 +1,36 @@
+package org.opencdmp.commonmodels.models.plan;
+
+import java.util.UUID;
+
+public class PlanStatusModel {
+
+    private UUID id;
+
+    private String name;
+
+    private org.opencdmp.commonmodels.enums.PlanStatus internalStatus;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public org.opencdmp.commonmodels.enums.PlanStatus getInternalStatus() {
+        return internalStatus;
+    }
+
+    public void setInternalStatus(org.opencdmp.commonmodels.enums.PlanStatus internalStatus) {
+        this.internalStatus = internalStatus;
+    }
+}