From 1cb8426f236caf55c57a4b24d82790ef52f3da6c Mon Sep 17 00:00:00 2001 From: "CITE\\amentis" Date: Mon, 23 Sep 2024 17:05:25 +0300 Subject: [PATCH 1/2] refactor plan work flow status --- .../models/description/DescriptionModel.java | 1 - .../models/description/DescriptionStatus.java | 36 +++++++++++++++++++ .../commonmodels/models/plan/PlanModel.java | 1 - .../commonmodels/models/plan/PlanStatus.java | 36 +++++++++++++++++++ 4 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/opencdmp/commonmodels/models/description/DescriptionStatus.java create mode 100644 src/main/java/org/opencdmp/commonmodels/models/plan/PlanStatus.java diff --git a/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionModel.java b/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionModel.java index 1a8d3fb..cd42477 100644 --- a/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionModel.java +++ b/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; diff --git a/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionStatus.java b/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionStatus.java new file mode 100644 index 0000000..70ee214 --- /dev/null +++ b/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionStatus.java @@ -0,0 +1,36 @@ +package org.opencdmp.commonmodels.models.description; + +import java.util.UUID; + +public class DescriptionStatus { + + 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; + } +} diff --git a/src/main/java/org/opencdmp/commonmodels/models/plan/PlanModel.java b/src/main/java/org/opencdmp/commonmodels/models/plan/PlanModel.java index 1d34f41..4a7334c 100644 --- a/src/main/java/org/opencdmp/commonmodels/models/plan/PlanModel.java +++ b/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; diff --git a/src/main/java/org/opencdmp/commonmodels/models/plan/PlanStatus.java b/src/main/java/org/opencdmp/commonmodels/models/plan/PlanStatus.java new file mode 100644 index 0000000..8f03e85 --- /dev/null +++ b/src/main/java/org/opencdmp/commonmodels/models/plan/PlanStatus.java @@ -0,0 +1,36 @@ +package org.opencdmp.commonmodels.models.plan; + +import java.util.UUID; + +public class PlanStatus { + + 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; + } +} From 6344f8cfe3abfe6415e02b679a25019f70f9c89e Mon Sep 17 00:00:00 2001 From: "CITE\\amentis" Date: Tue, 24 Sep 2024 12:58:29 +0300 Subject: [PATCH 2/2] no message --- .../commonmodels/models/description/DescriptionModel.java | 6 +++--- .../{DescriptionStatus.java => DescriptionStatusModel.java} | 2 +- .../org/opencdmp/commonmodels/models/plan/PlanModel.java | 6 +++--- .../models/plan/{PlanStatus.java => PlanStatusModel.java} | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename src/main/java/org/opencdmp/commonmodels/models/description/{DescriptionStatus.java => DescriptionStatusModel.java} (95%) rename src/main/java/org/opencdmp/commonmodels/models/plan/{PlanStatus.java => PlanStatusModel.java} (95%) diff --git a/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionModel.java b/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionModel.java index cd42477..48214cc 100644 --- a/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionModel.java +++ b/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionModel.java @@ -13,7 +13,7 @@ public class DescriptionModel { private String label; private String description; private List tags; - private DescriptionStatus status; + private DescriptionStatusModel status; private DescriptionTemplateModel descriptionTemplate; private PlanModel plan; private UUID sectionId; @@ -79,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; } diff --git a/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionStatus.java b/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionStatusModel.java similarity index 95% rename from src/main/java/org/opencdmp/commonmodels/models/description/DescriptionStatus.java rename to src/main/java/org/opencdmp/commonmodels/models/description/DescriptionStatusModel.java index 70ee214..6bd36db 100644 --- a/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionStatus.java +++ b/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionStatusModel.java @@ -2,7 +2,7 @@ package org.opencdmp.commonmodels.models.description; import java.util.UUID; -public class DescriptionStatus { +public class DescriptionStatusModel { private UUID id; diff --git a/src/main/java/org/opencdmp/commonmodels/models/plan/PlanModel.java b/src/main/java/org/opencdmp/commonmodels/models/plan/PlanModel.java index 4a7334c..6ed8e62 100644 --- a/src/main/java/org/opencdmp/commonmodels/models/plan/PlanModel.java +++ b/src/main/java/org/opencdmp/commonmodels/models/plan/PlanModel.java @@ -20,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; @@ -143,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; } diff --git a/src/main/java/org/opencdmp/commonmodels/models/plan/PlanStatus.java b/src/main/java/org/opencdmp/commonmodels/models/plan/PlanStatusModel.java similarity index 95% rename from src/main/java/org/opencdmp/commonmodels/models/plan/PlanStatus.java rename to src/main/java/org/opencdmp/commonmodels/models/plan/PlanStatusModel.java index 8f03e85..667fc50 100644 --- a/src/main/java/org/opencdmp/commonmodels/models/plan/PlanStatus.java +++ b/src/main/java/org/opencdmp/commonmodels/models/plan/PlanStatusModel.java @@ -2,7 +2,7 @@ package org.opencdmp.commonmodels.models.plan; import java.util.UUID; -public class PlanStatus { +public class PlanStatusModel { private UUID id;