Make fullname and last_signed_in optional

Author: harminius

server/mergin/auth/models.py

@@ -268,7 +268,7 @@ class UserProfile(db.Model):
         ),
     )
 
-    def name(self):
+    def name(self) -> Optional[str]:
         return f'{self.first_name if self.first_name else ""} {self.last_name if self.last_name else ""}'.strip()
 
 

server/mergin/auth/schemas.py

@@ -11,7 +11,7 @@
 
 class UserProfileSchema(ma.SQLAlchemyAutoSchema):
     name = ma.Function(
-        lambda obj: f'{obj.first_name if obj.first_name else ""} {obj.last_name if obj.last_name else ""}'.strip(),
+        lambda obj: obj.name(),
         dump_only=True,
     )
     storage = fields.Method("get_storage", dump_only=True)

server/mergin/sync/models.py

@@ -378,7 +378,7 @@ class ProjectAccessDetail:
     workspace_role: str
     project_role: Optional[ProjectRole]
     type: str
-    last_signed_in: str
+    last_signed_in: Optional[datetime]
 
 
 class ProjectFilePath(db.Model):

server/mergin/sync/public_api_v2.yaml

@@ -529,6 +529,7 @@ components:
         role:
           $ref: "#/components/schemas/Role"
         fullname:
+          nullable: true
           type: string
           example: John Doe
     ProjectDetail:

server/mergin/sync/workspace.py

@@ -341,6 +341,7 @@ def project_access(self, project: Project) -> List[ProjectAccessDetail]:
                 role=project_permission and project_permission.value,
                 project_role=project_role.value if project_role else None,
                 type="member",
+                last_signed_in=dm.last_signed_in,
             )
             result.append(member)
         if global_role:
@@ -355,6 +356,7 @@ def project_access(self, project: Project) -> List[ProjectAccessDetail]:
                     role=global_role,
                     project_role=None,
                     type="member",
+                    last_signed_in=gm.last_signed_in,
                 )
                 result.append(member)
         return result

web-app/packages/lib/src/modules/project/types.ts

@@ -366,7 +366,7 @@ export interface ProjectAccessDetail {
       permissions: ProjectPermissionName
     }
   }
-  last_signed_in: string
+  last_signed_in?: string
 }
 
 export interface ProjectCollaborator {
@@ -376,7 +376,7 @@ export interface ProjectCollaborator {
   workspace_role: WorkspaceRoleName
   project_role: ProjectRoleName | null
   role: ProjectRoleName
-  fullname: string
+  fullname?: string
 }
 
 // router related types