Merge to Main for Release

.github/workflows/maven-ci.yml

@@ -6,9 +6,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'adopt'
@@ -23,9 +23,9 @@ jobs:
       packages: write
     if: github.ref == 'refs/heads/develop'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: '17'

.github/workflows/release.yml

@@ -9,9 +9,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: '17'

.github/workflows/updateCodeJSON.yml

@@ -0,0 +1,25 @@
+name: Update Code.json
+on:
+  schedule: 
+    - cron: 0 0 1 * * # First day of every month
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+  issues: write
+
+jobs:
+  update-code-json:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Update code.json
+        uses: DSACMS/automated-codejson-generator@v1.0.1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: "develop"

.gitignore

@@ -7,8 +7,8 @@ target/
 .classpath
 .project
 .settings
-
+bin
 
 ### macOs files
 .DS_Store
-src/.DS_Store
+src/.DS_Store

pom.xml

@@ -6,18 +6,18 @@
 
   <groupId>gov.cms.madie</groupId>
   <artifactId>madie-java-models</artifactId>
-  <version>0.6.8</version>
+  <version>0.8.3</version>
   <name>madie-java-models</name>
   <description>Java based models for MADiE microservices</description>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>17</java.version>
     <mvn.checkstyle.file>checkstyle.xml</mvn.checkstyle.file>
-    <mvn.checkstyle.version>3.1.2</mvn.checkstyle.version>
+    <mvn.checkstyle.version>3.3.0</mvn.checkstyle.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <fasterxml.jackson.version>2.13.3</fasterxml.jackson.version>
-    <springboot.version>3.0.3</springboot.version>
+    <fasterxml.jackson.version>2.15.3</fasterxml.jackson.version>
+    <springboot.version>3.5.7</springboot.version>
   </properties>
 
   <distributionManagement>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.22</version>
+      <version>1.18.30</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -72,6 +72,11 @@
       <artifactId>jackson-databind</artifactId>
       <version>${fasterxml.jackson.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.18.0</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -136,10 +141,27 @@
               </goals>
             </execution>
           </executions>
-
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>com.spotify.fmt</groupId>
+        <artifactId>fmt-maven-plugin</artifactId>
+        <version>2.23</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>format</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <skipSortingImports>true</skipSortingImports>
+          <style>google</style>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 
   <reporting>

src/main/java/gov/cms/madie/models/access/AclOperation.java

@@ -0,0 +1,24 @@
+package gov.cms.madie.models.access;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class AclOperation {
+  @NotEmpty private List<AclSpecification> acls;
+  @NotNull private AclAction action;
+
+  public enum AclAction {
+    GRANT,
+    REVOKE
+  }
+}

src/main/java/gov/cms/madie/models/access/AclSpecification.java

@@ -1,12 +1,19 @@
 package gov.cms.madie.models.access;
 
-import java.util.List;
+import java.io.Serializable;
+import java.util.Set;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
-public class AclSpecification {
-
-  private String userId ;
-  private List<RoleEnum> roles ; 
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class AclSpecification implements Serializable {
 
+  private String userId;
+  private Set<RoleEnum> roles;
 }

src/main/java/gov/cms/madie/models/access/HarpRole.java

@@ -0,0 +1,15 @@
+package gov.cms.madie.models.access;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class HarpRole {
+  private String roleType;
+  private String role;
+}

src/main/java/gov/cms/madie/models/access/MadieUser.java

@@ -0,0 +1,28 @@
+package gov.cms.madie.models.access;
+
+import lombok.*;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.time.Instant;
+import java.util.List;
+
+@Document
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class MadieUser {
+  @Id private String id;
+  private String harpId;
+  private UserStatus status;
+  private String firstName;
+  private String lastName;
+  private String displayName;
+  private String email;
+  @Singular private List<HarpRole> roles;
+  private Instant lastLoginAt;
+  private Instant accessStartAt; // most recent MADiE role granted at this datetime
+  private Instant createdAt;
+  private Instant lastModifiedAt;
+}

src/main/java/gov/cms/madie/models/access/UserStatus.java

@@ -0,0 +1,7 @@
+package gov.cms.madie.models.access;
+
+public enum UserStatus {
+  ACTIVE,
+  DEACTIVATED,
+  ERROR_SUSPENDED
+}

src/main/java/gov/cms/madie/models/common/AccessControlAction.java

@@ -0,0 +1,16 @@
+package gov.cms.madie.models.common;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Data
+@Document
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AccessControlAction extends Action {
+  private String sharedWith;
+}

src/main/java/gov/cms/madie/models/common/Action.java

@@ -1,18 +1,19 @@
 package gov.cms.madie.models.common;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.time.Instant;
 
 @Data
-@Builder(toBuilder = true)
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 public class Action {
   private ActionType actionType;
   private Instant performedAt;
   private String performedBy;
+  private String additionalActionMessage;
 }

src/main/java/gov/cms/madie/models/common/ActionLog.java

@@ -1,14 +1,22 @@
 package gov.cms.madie.models.common;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.List;
 
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Document(collection = "measureActionLog")
 public class ActionLog {
-  @Id
-  private String id;
+  @Id private String id;
   private String targetId;
   private List<Action> actions;
 }

src/main/java/gov/cms/madie/models/common/ActionType.java

@@ -8,5 +8,15 @@ public enum ActionType {
   DELETED,
   IMPORTED,
   UPDATED,
-  DRAFTED
+  DRAFTED,
+  ASSOCIATED,
+  SHARED,
+  UNSHARED,
+  ADJUSTED_BY_ADMIN,
+  VERSION_REVERT,
+  CREATE_CMSID,
+  DELETE_CMSID,
+  OWNERSHIP_TRANSFER,
+  EXPORTED_MEASURE,
+  EXPORTED_TESTCASES
 }

src/main/java/gov/cms/madie/models/common/BundleType.java

@@ -1,21 +1,20 @@
 package gov.cms.madie.models.common;
 
 public enum BundleType {
-	  TRANSACTION("transaction"),
-	  COLLECTION("collection");
+  TRANSACTION("transaction"),
+  COLLECTION("collection");
 
-	  private final String bundleType;
+  private final String bundleType;
 
-	  private BundleType(String s) {
-	    bundleType = s;
-	  }
+  private BundleType(String s) {
+    bundleType = s;
+  }
 
-	  public boolean equalsType(String otherType) {
-	    return bundleType.equals(otherType);
-	  }
-
-	  public String toString() {
-	    return this.bundleType;
-	  }
-	}
+  public boolean equalsType(String otherType) {
+    return bundleType.equals(otherType);
+  }
 
+  public String toString() {
+    return this.bundleType;
+  }
+}

src/main/java/gov/cms/madie/models/common/EndorserOrganization.java

@@ -14,9 +14,7 @@
 @Document(collection = "endorserOrganization")
 public class EndorserOrganization {
 
-    @Id
-    private String id;
-
-    private String endorserOrganization;
+  @Id private String id;
 
+  private String endorserOrganization;
 }