Merge pull request #115 from usdot-jpo-ode/cvmanager-keycloak-changes

Updates from CVManager keycloak integration
CDOT-CV · Nov 14, 2024 · ba6b432 · ba6b432
2 parents f02f235 + 9f7d648
commit ba6b432
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/jpo-conflictmonitor b/jpo-conflictmonitor
diff --git a/...isualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/postgres/UserRepository.java b/...isualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/postgres/UserRepository.java
diff --git a/...zer-api/src/main/java/us/dot/its/jpo/ode/api/models/postgres/tables/UserOrganization.java b/...zer-api/src/main/java/us/dot/its/jpo/ode/api/models/postgres/tables/UserOrganization.java
@@ -10,7 +10,6 @@
 import lombok.Setter;
 import lombok.ToString;
 
-
 @ToString
 @Setter
 @EqualsAndHashCode
@@ -21,8 +20,8 @@ public class UserOrganization {
 
     @Id
     private int user_organization_id;
-    private UUID user_id;
+    private int user_id;
     private int organization_id;
     private int role_id;
-    
+
 }
diff --git a/...lictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/models/postgres/tables/Users.java b/...lictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/models/postgres/tables/Users.java
@@ -10,7 +10,6 @@
 import lombok.Setter;
 import lombok.ToString;
 
-
 @ToString
 @Setter
 @EqualsAndHashCode
@@ -20,11 +19,12 @@
 public class Users {
 
     @Id
-    private UUID user_id;
+    private int user_id;
+    private UUID keycloak_id;
     private String email;
     private String first_name;
     private String last_name;
     private long created_timestamp;
     private boolean super_user;
-    
+
 }