#3124: Abtract status through all object and query types

client/src/components/Model.js

@@ -243,6 +243,11 @@ export default class Model {
     notes: []
   }
 
+  static STATUS = {
+    ACTIVE: "ACTIVE",
+    INACTIVE: "INACTIVE"
+  }
+
   static yupSchema = yup.object().shape({
     notes: yup.array().nullable().default([])
   })

client/src/models/AuthorizationGroup.js

@@ -13,11 +13,6 @@ export default class AuthorizationGroup extends Model {
     return "Authorization Group"
   }
 
-  static STATUS = {
-    ACTIVE: "ACTIVE",
-    INACTIVE: "INACTIVE"
-  }
-
   static yupSchema = yup
     .object()
     .shape({
@@ -26,7 +21,7 @@ export default class AuthorizationGroup extends Model {
       status: yup
         .string()
         .required()
-        .default(() => AuthorizationGroup.STATUS.ACTIVE),
+        .default(() => Model.STATUS.ACTIVE),
       positions: yup.array().nullable().default([])
     })
     .concat(Model.yupSchema)

client/src/models/Location.js

@@ -9,11 +9,6 @@ export default class Location extends Model {
   static getInstanceName = "location"
   static relatedObjectType = "locations"
 
-  static STATUS = {
-    ACTIVE: "ACTIVE",
-    INACTIVE: "INACTIVE"
-  }
-
   static APPROVAL_STEP_TYPE = {
     PLANNING_APPROVAL: "PLANNING_APPROVAL",
     REPORT_APPROVAL: "REPORT_APPROVAL"
@@ -26,7 +21,7 @@ export default class Location extends Model {
       status: yup
         .string()
         .required()
-        .default(() => Location.STATUS.ACTIVE),
+        .default(() => Model.STATUS.ACTIVE),
       lat: yup
         .number()
         .nullable()

client/src/models/Organization.js

@@ -10,11 +10,6 @@ export default class Organization extends Model {
   static getInstanceName = "organization"
   static relatedObjectType = "organizations"
 
-  static STATUS = {
-    ACTIVE: "ACTIVE",
-    INACTIVE: "INACTIVE"
-  }
-
   static TYPE = {
     ADVISOR_ORG: "ADVISOR_ORG",
     PRINCIPAL_ORG: "PRINCIPAL_ORG"
@@ -37,7 +32,7 @@ export default class Organization extends Model {
       status: yup
         .string()
         .required()
-        .default(() => Organization.STATUS.ACTIVE),
+        .default(() => Model.STATUS.ACTIVE),
       identificationCode: yup.string().nullable().default(""),
       type: yup
         .string()

client/src/models/Person.js

@@ -21,11 +21,6 @@ export default class Person extends Model {
   static getInstanceName = "person"
   static relatedObjectType = "people"
 
-  static STATUS = {
-    ACTIVE: "ACTIVE",
-    INACTIVE: "INACTIVE"
-  }
-
   static ROLE = {
     ADVISOR: "ADVISOR",
     PRINCIPAL: "PRINCIPAL"
@@ -153,7 +148,7 @@ export default class Person extends Model {
       status: yup
         .string()
         .nullable()
-        .default(() => Person.STATUS.ACTIVE)
+        .default(() => Model.STATUS.ACTIVE)
     })
     // not actually in the database, the database contains the JSON customFields
     .concat(Person.customFieldsSchema)

client/src/models/Position.js

@@ -17,11 +17,6 @@ export default class Position extends Model {
   static getInstanceName = "position"
   static relatedObjectType = "positions"
 
-  static STATUS = {
-    ACTIVE: "ACTIVE",
-    INACTIVE: "INACTIVE"
-  }
-
   static TYPE = {
     ADVISOR: "ADVISOR",
     PRINCIPAL: "PRINCIPAL",
@@ -45,7 +40,7 @@ export default class Position extends Model {
       status: yup
         .string()
         .required()
-        .default(() => Position.STATUS.ACTIVE),
+        .default(() => Model.STATUS.ACTIVE),
       associatedPositions: yup.array().nullable().default([]),
       previousPeople: yup.array().nullable().default([]),
       organization: yup

client/src/models/Task.js

@@ -31,11 +31,6 @@ export default class Task extends Model {
     return shortLabel
   }
 
-  static STATUS = {
-    ACTIVE: "ACTIVE",
-    INACTIVE: "INACTIVE"
-  }
-
   static APPROVAL_STEP_TYPE = {
     PLANNING_APPROVAL: "PLANNING_APPROVAL",
     REPORT_APPROVAL: "REPORT_APPROVAL"
@@ -96,7 +91,7 @@ export default class Task extends Model {
       status: yup
         .string()
         .required()
-        .default(() => Task.STATUS.ACTIVE),
+        .default(() => Model.STATUS.ACTIVE),
       responsiblePositions: yup
         .array()
         .nullable()

src/main/java/mil/dds/anet/InitializationCommand.java

@@ -12,7 +12,6 @@
 import mil.dds.anet.beans.Organization;
 import mil.dds.anet.beans.Organization.OrganizationType;
 import mil.dds.anet.beans.Person;
-import mil.dds.anet.beans.Person.PersonStatus;
 import mil.dds.anet.beans.Person.Role;
 import mil.dds.anet.beans.Position;
 import mil.dds.anet.beans.Position.PositionType;
@@ -71,7 +70,7 @@ protected void run(Environment environment, Namespace namespace, AnetConfigurati
     Organization adminOrg = new Organization();
     adminOrg.setType(OrganizationType.ADVISOR_ORG);
     adminOrg.setShortName(scanner.nextLine());
-    adminOrg.setStatus(Organization.OrganizationStatus.ACTIVE);
+    adminOrg.setStatus(Organization.Status.ACTIVE);
     adminOrg = engine.getOrganizationDao().insert(adminOrg);
     System.out.println("... Organization " + adminOrg.getUuid() + " Saved!");
 
@@ -81,7 +80,7 @@ protected void run(Environment environment, Namespace namespace, AnetConfigurati
     adminPos.setType(PositionType.ADMINISTRATOR);
     adminPos.setOrganizationUuid(adminOrg.getUuid());
     adminPos.setName(scanner.nextLine());
-    adminPos.setStatus(Position.PositionStatus.ACTIVE);
+    adminPos.setStatus(Position.Status.ACTIVE);
     adminPos = engine.getPositionDao().insert(adminPos);
     System.out.println("... Position " + adminPos.getUuid() + " Saved!");
 

src/main/java/mil/dds/anet/auth/AnetAuthenticationFilter.java

@@ -15,7 +15,6 @@
 import javax.ws.rs.core.SecurityContext;
 import mil.dds.anet.AnetObjectEngine;
 import mil.dds.anet.beans.Person;
-import mil.dds.anet.beans.Person.PersonStatus;
 import mil.dds.anet.beans.Person.Role;
 import mil.dds.anet.beans.Position;
 import mil.dds.anet.beans.Position.PositionType;

src/main/java/mil/dds/anet/auth/AnetDevAuthenticator.java

@@ -9,7 +9,6 @@
 import java.util.Optional;
 import mil.dds.anet.AnetObjectEngine;
 import mil.dds.anet.beans.Person;
-import mil.dds.anet.beans.Person.PersonStatus;
 import mil.dds.anet.beans.Person.Role;
 import mil.dds.anet.database.PersonDao;
 

src/main/java/mil/dds/anet/beans/AuthorizationGroup.java

@@ -11,11 +11,7 @@
 import mil.dds.anet.utils.Utils;
 import mil.dds.anet.views.AbstractAnetBean;
 
-public class AuthorizationGroup extends AbstractAnetBean implements RelatableObject {
-
-  public static enum AuthorizationGroupStatus {
-    ACTIVE, INACTIVE
-  }
+public class AuthorizationGroup extends AbstractAnetBean implements RelatableObject, WithStatus {
 
   @GraphQLQuery
   @GraphQLInputField
@@ -27,7 +23,7 @@ public static enum AuthorizationGroupStatus {
   private List<Position> positions;
   @GraphQLQuery
   @GraphQLInputField
-  private AuthorizationGroupStatus status;
+  private Status status;
 
   public String getName() {
     return name;
@@ -67,11 +63,11 @@ public void setPositions(List<Position> positions) {
     this.positions = positions;
   }
 
-  public AuthorizationGroupStatus getStatus() {
+  public Status getStatus() {
     return status;
   }
 
-  public void setStatus(AuthorizationGroupStatus status) {
+  public void setStatus(Status status) {
     this.status = status;
   }
 

src/main/java/mil/dds/anet/beans/Location.java

@@ -11,21 +11,17 @@
 import mil.dds.anet.utils.Utils;
 import mil.dds.anet.views.AbstractAnetBean;
 
-public class Location extends AbstractAnetBean implements RelatableObject {
+public class Location extends AbstractAnetBean implements RelatableObject, WithStatus {
 
   /** Pseudo uuid to represent 'no location'. */
   public static final String DUMMY_LOCATION_UUID = "-1";
 
-  public static enum LocationStatus {
-    ACTIVE, INACTIVE
-  }
-
   @GraphQLQuery
   @GraphQLInputField
   private String name;
   @GraphQLQuery
   @GraphQLInputField
-  private LocationStatus status;
+  private Status status;
   @GraphQLQuery
   @GraphQLInputField
   private Double lat;
@@ -46,11 +42,11 @@ public void setName(String name) {
     this.name = Utils.trimStringReturnNull(name);
   }
 
-  public LocationStatus getStatus() {
+  public Status getStatus() {
     return status;
   }
 
-  public void setStatus(LocationStatus status) {
+  public void setStatus(Status status) {
     this.status = status;
   }
 

src/main/java/mil/dds/anet/beans/Organization.java

@@ -22,15 +22,11 @@
 import mil.dds.anet.views.AbstractAnetBean;
 import mil.dds.anet.views.UuidFetcher;
 
-public class Organization extends AbstractAnetBean implements RelatableObject {
+public class Organization extends AbstractAnetBean implements RelatableObject, WithStatus {
 
   /** Pseudo uuid to represent all/top-level organization(s). */
   public static final String DUMMY_ORG_UUID = "-1";
 
-  public static enum OrganizationStatus {
-    ACTIVE, INACTIVE
-  }
-
   public static enum OrganizationType {
     ADVISOR_ORG, PRINCIPAL_ORG
   }
@@ -43,7 +39,7 @@ public static enum OrganizationType {
   String longName;
   @GraphQLQuery
   @GraphQLInputField
-  private OrganizationStatus status;
+  private Status status;
   @GraphQLQuery
   @GraphQLInputField
   private String identificationCode;
@@ -77,11 +73,11 @@ public void setLongName(String longName) {
     this.longName = Utils.trimStringReturnNull(longName);
   }
 
-  public OrganizationStatus getStatus() {
+  public Status getStatus() {
     return status;
   }
 
-  public void setStatus(OrganizationStatus status) {
+  public void setStatus(Status status) {
     this.status = status;
   }
 

src/main/java/mil/dds/anet/beans/Person.java

@@ -21,11 +21,8 @@
 import mil.dds.anet.views.AbstractCustomizableAnetBean;
 import mil.dds.anet.views.UuidFetcher;
 
-public class Person extends AbstractCustomizableAnetBean implements Principal, RelatableObject {
-
-  public static enum PersonStatus {
-    ACTIVE, INACTIVE
-  }
+public class Person extends AbstractCustomizableAnetBean
+    implements Principal, RelatableObject, WithStatus {
 
   public static enum Role {
     ADVISOR, PRINCIPAL
@@ -38,7 +35,7 @@ public static enum Role {
   private String name;
   @GraphQLQuery
   @GraphQLInputField
-  private PersonStatus status = PersonStatus.ACTIVE;
+  private Status status = Status.ACTIVE;
   @GraphQLQuery
   @GraphQLInputField
   private Role role;
@@ -88,11 +85,11 @@ public void setName(String name) {
     this.name = Utils.trimStringReturnNull(name);
   }
 
-  public PersonStatus getStatus() {
+  public Status getStatus() {
     return status;
   }
 
-  public void setStatus(PersonStatus status) {
+  public void setStatus(Status status) {
     this.status = status;
   }
 

src/main/java/mil/dds/anet/beans/Position.java

@@ -14,16 +14,12 @@
 import mil.dds.anet.views.AbstractAnetBean;
 import mil.dds.anet.views.UuidFetcher;
 
-public class Position extends AbstractAnetBean implements RelatableObject {
+public class Position extends AbstractAnetBean implements RelatableObject, WithStatus {
 
   public static enum PositionType {
     ADVISOR, PRINCIPAL, SUPER_USER, ADMINISTRATOR
   }
 
-  public static enum PositionStatus {
-    ACTIVE, INACTIVE
-  }
-
   @GraphQLQuery
   @GraphQLInputField
   String name;
@@ -35,7 +31,7 @@ public static enum PositionStatus {
   PositionType type;
   @GraphQLQuery
   @GraphQLInputField
-  PositionStatus status;
+  Status status;
   // Lazy Loaded
   // annotated below
   private ForeignObjectHolder<Organization> organization = new ForeignObjectHolder<>();
@@ -74,11 +70,11 @@ public void setType(PositionType type) {
     this.type = type;
   }
 
-  public PositionStatus getStatus() {
+  public Status getStatus() {
     return status;
   }
 
-  public void setStatus(PositionStatus status) {
+  public void setStatus(Status status) {
     this.status = status;
   }