From 482d200b790ca63e9589b748583b2cb696bd73e8 Mon Sep 17 00:00:00 2001 From: William Newman Date: Mon, 25 Sep 2023 11:07:02 -0600 Subject: [PATCH] Move permission data store class --- .../compat/server5/observation/edit/FormViewModel_server5.kt | 2 +- .../mil/nga/giat/mage/database/model/permission/Role.java | 4 ++-- mage/src/main/java/mil/nga/giat/mage/form/FormViewModel.kt | 2 +- .../java/mil/nga/giat/mage/network/role/RolesDeserializer.kt | 4 ++-- .../mil/nga/giat/mage/network/user/UserWithRoleTypeAdapter.kt | 4 ++-- .../nga/giat/mage/observation/view/ObservationViewActivity.kt | 2 +- .../model/permission => sdk/datastore/user}/Permission.java | 2 +- .../model/permission => sdk/datastore/user}/Permissions.kt | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) rename mage/src/main/java/mil/nga/giat/mage/{database/model/permission => sdk/datastore/user}/Permission.java (95%) rename mage/src/main/java/mil/nga/giat/mage/{database/model/permission => sdk/datastore/user}/Permissions.kt (86%) diff --git a/mage/src/main/java/mil/nga/giat/mage/compat/server5/observation/edit/FormViewModel_server5.kt b/mage/src/main/java/mil/nga/giat/mage/compat/server5/observation/edit/FormViewModel_server5.kt index 232e16f2..787a25f1 100644 --- a/mage/src/main/java/mil/nga/giat/mage/compat/server5/observation/edit/FormViewModel_server5.kt +++ b/mage/src/main/java/mil/nga/giat/mage/compat/server5/observation/edit/FormViewModel_server5.kt @@ -20,7 +20,7 @@ import mil.nga.giat.mage.form.field.FieldValue import mil.nga.giat.mage.form.field.GeometryFieldState import mil.nga.giat.mage.observation.* import mil.nga.giat.mage.observation.edit.MediaAction -import mil.nga.giat.mage.database.model.permission.Permission +import mil.nga.giat.mage.sdk.datastore.user.Permission import mil.nga.giat.mage.database.model.user.User import mil.nga.giat.mage.data.datasource.user.UserLocalDataSource import mil.nga.giat.mage.sdk.exceptions.UserException diff --git a/mage/src/main/java/mil/nga/giat/mage/database/model/permission/Role.java b/mage/src/main/java/mil/nga/giat/mage/database/model/permission/Role.java index 33a5c06b..87d2fd05 100644 --- a/mage/src/main/java/mil/nga/giat/mage/database/model/permission/Role.java +++ b/mage/src/main/java/mil/nga/giat/mage/database/model/permission/Role.java @@ -7,11 +7,11 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; +import mil.nga.giat.mage.sdk.datastore.user.Permissions; + @DatabaseTable(tableName = "roles") public class Role { - public static final String ADMIN_ROLE_NAME = "ADMIN_ROLE"; - @DatabaseField(generatedId = true) private Long _id; diff --git a/mage/src/main/java/mil/nga/giat/mage/form/FormViewModel.kt b/mage/src/main/java/mil/nga/giat/mage/form/FormViewModel.kt index 40814777..c8c5d418 100644 --- a/mage/src/main/java/mil/nga/giat/mage/form/FormViewModel.kt +++ b/mage/src/main/java/mil/nga/giat/mage/form/FormViewModel.kt @@ -18,7 +18,7 @@ import mil.nga.giat.mage.data.datasource.observation.ObservationLocalDataSource import mil.nga.giat.mage.database.model.observation.ObservationImportant import mil.nga.giat.mage.database.model.observation.ObservationProperty import mil.nga.giat.mage.database.model.observation.State -import mil.nga.giat.mage.database.model.permission.Permission +import mil.nga.giat.mage.sdk.datastore.user.Permission import mil.nga.giat.mage.database.model.user.User import mil.nga.giat.mage.data.datasource.user.UserLocalDataSource import mil.nga.giat.mage.form.Form.Companion.fromJson diff --git a/mage/src/main/java/mil/nga/giat/mage/network/role/RolesDeserializer.kt b/mage/src/main/java/mil/nga/giat/mage/network/role/RolesDeserializer.kt index a5d061ba..277bae6c 100644 --- a/mage/src/main/java/mil/nga/giat/mage/network/role/RolesDeserializer.kt +++ b/mage/src/main/java/mil/nga/giat/mage/network/role/RolesDeserializer.kt @@ -5,9 +5,9 @@ import com.google.gson.JsonDeserializationContext import com.google.gson.JsonDeserializer import com.google.gson.JsonElement import com.google.gson.JsonParseException -import mil.nga.giat.mage.database.model.permission.Permission -import mil.nga.giat.mage.database.model.permission.Permissions +import mil.nga.giat.mage.sdk.datastore.user.Permission import mil.nga.giat.mage.database.model.permission.Role +import mil.nga.giat.mage.sdk.datastore.user.Permissions import java.lang.reflect.Type class RolesDeserializer : JsonDeserializer> { diff --git a/mage/src/main/java/mil/nga/giat/mage/network/user/UserWithRoleTypeAdapter.kt b/mage/src/main/java/mil/nga/giat/mage/network/user/UserWithRoleTypeAdapter.kt index 71b16bfe..8240ec3f 100644 --- a/mage/src/main/java/mil/nga/giat/mage/network/user/UserWithRoleTypeAdapter.kt +++ b/mage/src/main/java/mil/nga/giat/mage/network/user/UserWithRoleTypeAdapter.kt @@ -5,12 +5,12 @@ import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonWriter -import mil.nga.giat.mage.database.model.permission.Permission -import mil.nga.giat.mage.database.model.permission.Permissions +import mil.nga.giat.mage.sdk.datastore.user.Permission import mil.nga.giat.mage.database.model.permission.Role import mil.nga.giat.mage.database.model.user.Phone import mil.nga.giat.mage.database.model.user.User import mil.nga.giat.mage.network.gson.nextStringOrNull +import mil.nga.giat.mage.sdk.datastore.user.Permissions import mil.nga.giat.mage.sdk.utils.ISO8601DateFormatFactory import org.apache.commons.lang3.StringUtils import java.io.IOException diff --git a/mage/src/main/java/mil/nga/giat/mage/observation/view/ObservationViewActivity.kt b/mage/src/main/java/mil/nga/giat/mage/observation/view/ObservationViewActivity.kt index c4a9c730..b72597df 100644 --- a/mage/src/main/java/mil/nga/giat/mage/observation/view/ObservationViewActivity.kt +++ b/mage/src/main/java/mil/nga/giat/mage/observation/view/ObservationViewActivity.kt @@ -25,7 +25,7 @@ import mil.nga.giat.mage.observation.attachment.AttachmentViewActivity import mil.nga.giat.mage.observation.edit.ObservationEditActivity import mil.nga.giat.mage.people.PeopleActivity import mil.nga.giat.mage.database.model.observation.Attachment -import mil.nga.giat.mage.database.model.permission.Permission +import mil.nga.giat.mage.sdk.datastore.user.Permission import mil.nga.giat.mage.database.model.user.User import mil.nga.giat.mage.data.datasource.user.UserLocalDataSource import mil.nga.giat.mage.utils.googleMapsUri diff --git a/mage/src/main/java/mil/nga/giat/mage/database/model/permission/Permission.java b/mage/src/main/java/mil/nga/giat/mage/sdk/datastore/user/Permission.java similarity index 95% rename from mage/src/main/java/mil/nga/giat/mage/database/model/permission/Permission.java rename to mage/src/main/java/mil/nga/giat/mage/sdk/datastore/user/Permission.java index df0e8877..1647319c 100644 --- a/mage/src/main/java/mil/nga/giat/mage/database/model/permission/Permission.java +++ b/mage/src/main/java/mil/nga/giat/mage/sdk/datastore/user/Permission.java @@ -1,4 +1,4 @@ -package mil.nga.giat.mage.database.model.permission; +package mil.nga.giat.mage.sdk.datastore.user; import java.io.Serializable; diff --git a/mage/src/main/java/mil/nga/giat/mage/database/model/permission/Permissions.kt b/mage/src/main/java/mil/nga/giat/mage/sdk/datastore/user/Permissions.kt similarity index 86% rename from mage/src/main/java/mil/nga/giat/mage/database/model/permission/Permissions.kt rename to mage/src/main/java/mil/nga/giat/mage/sdk/datastore/user/Permissions.kt index e8ac1934..1bc084f0 100644 --- a/mage/src/main/java/mil/nga/giat/mage/database/model/permission/Permissions.kt +++ b/mage/src/main/java/mil/nga/giat/mage/sdk/datastore/user/Permissions.kt @@ -1,4 +1,4 @@ -package mil.nga.giat.mage.database.model.permission +package mil.nga.giat.mage.sdk.datastore.user import java.io.Serializable