Merge frontend user model

diff --git a/src-ui/cypress/fixtures/documents/1/comments.json b/src-ui/cypress/fixtures/documents/1/comments.json
index 73e932187fe93d8be3116682362344fc8c263ddd..a6013b5133e7fb66c58f46f350c6deec55cdb348 100644 (file)
--- a/src-ui/cypress/fixtures/documents/1/comments.json
+++ b/src-ui/cypress/fixtures/documents/1/comments.json
@@ -6,8 +6,8 @@
         "user": {
             "id": 1,
             "username": "user2",
-            "firstname": "",
-            "lastname": ""
+            "first_name": "",
+            "last_name": ""
         }
     },
     {
@@ -17,8 +17,8 @@
         "user": {
             "id": 2,
             "username": "user1",
-            "firstname": "",
-            "lastname": ""
+            "first_name": "",
+            "last_name": ""
         }
     },
     {
@@ -28,8 +28,8 @@
         "user": {
             "id": 2,
             "username": "user33",
-            "firstname": "",
-            "lastname": ""
+            "first_name": "",
+            "last_name": ""
         }
     },
     {
@@ -39,8 +39,8 @@
         "user": {
             "id": 3,
             "username": "admin",
-            "firstname": "",
-            "lastname": ""
+            "first_name": "",
+            "last_name": ""
         }
     }
 ]

diff --git a/src-ui/src/app/components/document-comments/document-comments.component.ts b/src-ui/src/app/components/document-comments/document-comments.component.ts
index 06c383e980172b76b7ab31f51305c5fe8b8f989f..f5c63ab07e650999ce5dc7587804276a42da46b4 100644 (file)
--- a/src-ui/src/app/components/document-comments/document-comments.component.ts
+++ b/src-ui/src/app/components/document-comments/document-comments.component.ts
@@ -92,8 +92,8 @@ export class DocumentCommentsComponent extends ComponentWithPermissions {
   displayName(comment: PaperlessDocumentComment): string {
     if (!comment.user) return ''
     let nameComponents = []
-    if (comment.user.firstname) nameComponents.unshift(comment.user.firstname)
-    if (comment.user.lastname) nameComponents.unshift(comment.user.lastname)
+    if (comment.user.first_name) nameComponents.unshift(comment.user.first_name)
+    if (comment.user.last_name) nameComponents.unshift(comment.user.last_name)
     if (comment.user.username) {
       if (nameComponents.length > 0)
         nameComponents.push(`(${comment.user.username})`)

diff --git a/src-ui/src/app/data/paperless-document-comment.ts b/src-ui/src/app/data/paperless-document-comment.ts
index 14085cf3255386594d587302dd1ca184813039d4..884e59096fa81d1669d2d2a255c214d857f602c6 100644 (file)
--- a/src-ui/src/app/data/paperless-document-comment.ts
+++ b/src-ui/src/app/data/paperless-document-comment.ts
@@ -1,8 +1,8 @@
 import { ObjectWithId } from './object-with-id'
-import { User } from './user'
+import { PaperlessUser } from './paperless-user'
 
 export interface PaperlessDocumentComment extends ObjectWithId {
   created?: Date
   comment?: string
-  user?: User
+  user?: PaperlessUser
 }

diff --git a/src-ui/src/app/data/user.ts b/src-ui/src/app/data/user.ts
deleted file mode 100644 (file)
index adf00e8..0000000
--- a/src-ui/src/app/data/user.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { ObjectWithId } from './object-with-id'
-
-export interface User extends ObjectWithId {
-  username: string
-  firstname: string
-  lastname: string
-}

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index d876984bd0e2d286ac4c3d4c079649843bd51c9a..5c0e8ed712791379f14ea8615d051c60427047fc 100644 (file)
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -1400,8 +1400,8 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
                 "user": {
                     "id": comment.user.id,
                     "username": comment.user.username,
-                    "firstname": comment.user.first_name,
-                    "lastname": comment.user.last_name,
+                    "first_name": comment.user.first_name,
+                    "last_name": comment.user.last_name,
                 },
             },
         )

diff --git a/src/documents/views.py b/src/documents/views.py
index bc48faf031e9ddcdc6c8c44a8e9e6a43b04927e1..a59afadb7cd18e67d51f8f7e7d49a668ffd938d4 100644 (file)
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -400,8 +400,8 @@ class DocumentViewSet(
                 "user": {
                     "id": c.user.id,
                     "username": c.user.username,
-                    "firstname": c.user.first_name,
-                    "lastname": c.user.last_name,
+                    "first_name": c.user.first_name,
+                    "last_name": c.user.last_name,
                 },
             }
             for c in Comment.objects.filter(document=doc).order_by("-created")