refactor(user): differenciate User & MeUser models

make things clearer and move the User model in domain from gn4-api
geonetwork · Nov 28, 2023 · 8e46984 · 8e46984
1 parent b69ce36
commit 8e46984
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/libs/common/domain/src/lib/model/user/user.model.ts b/libs/common/domain/src/lib/model/user/user.model.ts
@@ -8,3 +8,20 @@ export interface MeUserModel {
   organisation: string
   profileIcon?: string
 }
+
+export interface UserModel {
+  profile?: string
+  surname?: string
+  enabled?: boolean
+  username?: string
+  id?: number
+  email?: string
+  emailAddresses?: Set<string>
+  organisation?: string
+  kind?: string
+  lastLoginDate?: string
+  accountNonExpired?: boolean
+  accountNonLocked?: boolean
+  credentialsNonExpired?: boolean
+  name?: string
+}
diff --git a/libs/feature/catalog/src/lib/my-org/my-org.service.ts b/libs/feature/catalog/src/lib/my-org/my-org.service.ts
@@ -13,15 +13,15 @@ export class MyOrgService {
     logoUrl: string
     recordCount: number
     userCount: number
-    userList: UserApiModel[]
+    userList: UserModel[]
   }>
 
   private myOrgDataSubject = new BehaviorSubject<{
     orgName: string
     logoUrl: string
     recordCount: number
     userCount: number
-    userList: UserApiModel[]
+    userList: UserModel[]
   }>({
     orgName: '',
     logoUrl: '',

diff --git a/libs/ui/elements/src/lib/user-preview/user-preview.component.ts b/libs/ui/elements/src/lib/user-preview/user-preview.component.ts
@@ -7,7 +7,7 @@ import { MeUserModel } from '@geonetwork-ui/common/domain/model/user/user.model'
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class UserPreviewComponent {
-  @Input() user: UserModel
+  @Input() user: MeUserModel
   @Input() avatarPlaceholder?: string
 
   get userFullName() {