Merge branch 'develop' into 'main'

chore: Add invitation accepted time

See merge request locker/api-core!612

Author: khaitranquang

locker_server/api/v1_0/sharing/serializers.py

@@ -17,6 +17,7 @@ def to_representation(self, instance):
         data = {
             "id": instance.team_member_id,
             "access_time": instance.access_time,
+            "accepted_time": instance.accepted_time,
             "role": instance.role.name,
             "status": instance.status,
             "team": {

locker_server/api/v1_0/sync/serializers.py

@@ -55,6 +55,7 @@ def to_representation(self, instance):
             "key": instance.key,
             "name": instance.team.name,
             "status": MAP_MEMBER_STATUS_TO_INT.get(instance.status),
+            "accepted_time": instance.accepted_time,
             "type": real_role,
         }
         return team_member_data

locker_server/api_orm/abstracts/members/team_members.py

@@ -11,6 +11,7 @@ class AbstractTeamMemberORM(models.Model):
     id = models.CharField(primary_key=True, max_length=128, default=uuid.uuid4)
     external_id = models.CharField(max_length=300, null=True)
     access_time = models.IntegerField()
+    accepted_time = models.IntegerField(null=True, default=None)
     is_default = models.BooleanField(default=False)
     is_primary = models.BooleanField(default=False)
     is_added_by_group = models.BooleanField(default=False)

locker_server/api_orm/migrations/0047_teammemberorm_accepted_time.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.13 on 2026-06-17 08:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_orm', '0046_backupcredentialorm_kdf_memory_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='teammemberorm',
+            name='accepted_time',
+            field=models.IntegerField(default=None, null=True),
+        ),
+    ]

locker_server/api_orm/model_parsers/team_parser.py

@@ -37,6 +37,7 @@ def parse_team_member(cls, team_member_orm: TeamMemberORM) -> TeamMember:
             team_member_id=team_member_orm.id,
             external_id=team_member_orm.external_id,
             access_time=team_member_orm.access_time,
+            accepted_time=team_member_orm.accepted_time,
             is_default=team_member_orm.is_default,
             is_primary=team_member_orm.is_primary,
             is_added_by_group=team_member_orm.is_added_by_group,

locker_server/api_orm/repositories/sharing_repository.py

@@ -315,9 +315,11 @@ def accept_invitation(self, member: TeamMember) -> Optional[TeamMember]:
         # Else, set status ACCEPTED
         else:
             member_orm.status = PM_MEMBER_STATUS_ACCEPTED
+        member_orm.accepted_time = now()
         member_orm.save()
         bump_account_revision_date(user=member_orm.user)
         member.status = member_orm.status
+        member.accepted_time = member_orm.accepted_time
         return member
 
     def reject_invitation(self, member: TeamMember):
@@ -333,12 +335,14 @@ def confirm_invitation(self, member: TeamMember, key: str):
         member_orm.email = None
         member_orm.key = key
         member_orm.status = PM_MEMBER_STATUS_CONFIRMED
+        member_orm.accepted_time = now()
         member_orm.save()
         bump_account_revision_date(user=member_orm.user)
 
         member.status = member_orm.status
         member.key = member_orm.key
         member.email = None
+        member.accepted_time = member_orm.accepted_time
         return member
 
     def update_role_invitation(self, member: TeamMember, role_id: str,

locker_server/core/entities/member/team_member.py

@@ -5,14 +5,16 @@
 
 
 class TeamMember(object):
-    def __init__(self, team_member_id: str, external_id: str = None, access_time: int = None, is_default: bool = False,
+    def __init__(self, team_member_id: str, external_id: str = None, access_time: int = None,
+                 accepted_time: int = None, is_default: bool = False,
                  is_primary: bool = False, is_added_by_group: bool = False, hide_passwords: bool = False,
                  key: str = None, reset_password_key: str = None, status: str = PM_MEMBER_STATUS_CONFIRMED,
                  email: str = None, token_invitation: str = None, user: User = None, team: Team = None,
                  role: MemberRole = None):
         self._team_member_id = team_member_id
         self._external_id = external_id
         self._access_time = access_time
+        self._accepted_time = accepted_time
         self._is_default = is_default
         self._is_primary = is_primary
         self._is_added_by_group = is_added_by_group
@@ -38,6 +40,14 @@ def external_id(self):
     def access_time(self):
         return self._access_time
 
+    @property
+    def accepted_time(self):
+        return self._accepted_time
+
+    @accepted_time.setter
+    def accepted_time(self, accepted_time_value):
+        self._accepted_time = accepted_time_value
+
     @property
     def is_default(self):
         return self._is_default