Feature/Adjust IdentityDeletionProcess (#143)

* feat: remove status deleting * feat: add approvalPeriodEndsAt * chore: version bump * chore: more version bump
nmshd · May 28, 2024 · 2b25ab4 · 2b25ab4
1 parent c699acd
commit 2b25ab4
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 20 deletions.
diff --git a/.dev/compose.backbone.env b/.dev/compose.backbone.env
@@ -1 +1 @@
-BACKBONE_VERSION=5.4.0
+BACKBONE_VERSION=5.5.0
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nmshd/runtime",
-    "version": "4.9.2",
+    "version": "4.10.0",
     "description": "The enmeshed client runtime.",
     "homepage": "https://enmeshed.eu",
     "repository": {
@@ -59,7 +59,7 @@
         "@nmshd/consumption": "3.11.0",
         "@nmshd/content": "2.10.0",
         "@nmshd/crypto": "2.0.6",
-        "@nmshd/transport": "2.7.1",
+        "@nmshd/transport": "2.7.2",
         "ajv": "^8.13.0",
         "ajv-errors": "^3.0.0",
         "ajv-formats": "^3.0.1",

diff --git a/packages/runtime/src/types/transport/IdentityDeletionProcessDTO.ts b/packages/runtime/src/types/transport/IdentityDeletionProcessDTO.ts
@@ -5,11 +5,12 @@ export interface IdentityDeletionProcessDTO {
     status: IdentityDeletionProcessStatus;
     createdAt?: string;
     createdByDevice?: string;
+    approvalPeriodEndsAt?: string;
+    rejectedAt?: string;
+    rejectedByDevice?: string;
     approvedAt?: string;
     approvedByDevice?: string;
     gracePeriodEndsAt?: string;
     cancelledAt?: string;
     cancelledByDevice?: string;
-    rejectedAt?: string;
-    rejectedByDevice?: string;
 }
diff --git a/...runtime/src/useCases/transport/identityDeletionProcesses/IdentityDeletionProcessMapper.ts b/...runtime/src/useCases/transport/identityDeletionProcesses/IdentityDeletionProcessMapper.ts
@@ -12,14 +12,15 @@ export class IdentityDeletionProcessMapper {
             id: identityDeletionProcess.id.toString(),
             createdAt: identityDeletionProcess.cache.createdAt?.toString(),
             createdByDevice: identityDeletionProcess.cache.createdByDevice?.toString(),
+            approvalPeriodEndsAt: identityDeletionProcess.cache.approvalPeriodEndsAt?.toString(),
+            rejectedAt: identityDeletionProcess.cache.rejectedAt?.toString(),
+            rejectedByDevice: identityDeletionProcess.cache.rejectedByDevice?.toString(),
             approvedAt: identityDeletionProcess.cache.approvedAt?.toString(),
             approvedByDevice: identityDeletionProcess.cache.approvedByDevice?.toString(),
             gracePeriodEndsAt: identityDeletionProcess.cache.gracePeriodEndsAt?.toString(),
             status: identityDeletionProcess.cache.status,
             cancelledAt: identityDeletionProcess.cache.cancelledAt?.toString(),
-            cancelledByDevice: identityDeletionProcess.cache.cancelledByDevice?.toString(),
-            rejectedAt: identityDeletionProcess.cache.rejectedAt?.toString(),
-            rejectedByDevice: identityDeletionProcess.cache.rejectedByDevice?.toString()
+            cancelledByDevice: identityDeletionProcess.cache.cancelledByDevice?.toString()
         };
     }
 

diff --git a/packages/transport/package.json b/packages/transport/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nmshd/transport",
-    "version": "2.7.1",
+    "version": "2.7.2",
     "description": "The transport library handles backbone communication and content encryption.",
     "homepage": "https://enmeshed.eu",
     "repository": {

diff --git a/packages/transport/src/modules/accounts/backbone/BackboneIdentityDeletionProcess.ts b/packages/transport/src/modules/accounts/backbone/BackboneIdentityDeletionProcess.ts
@@ -5,6 +5,7 @@ export interface BackboneIdentityDeletionProcess {
     status: IdentityDeletionProcessStatus;
     createdAt?: string;
     createdByDevice?: string;
+    approvalPeriodEndsAt?: string;
     rejectedAt?: string;
     rejectedByDevice?: string;
     approvedAt?: string;

diff --git a/packages/transport/src/modules/accounts/data/CachedIdentityDeletionProcess.ts b/packages/transport/src/modules/accounts/data/CachedIdentityDeletionProcess.ts
@@ -6,6 +6,7 @@ export interface CachedIdentityDeletionProcessJSON {
     status: IdentityDeletionProcessStatus;
     createdAt?: string;
     createdByDevice?: string;
+    approvalPeriodEndsAt?: string;
     rejectedAt?: string;
     rejectedByDevice?: string;
     approvedAt?: string;
@@ -19,6 +20,7 @@ export interface ICachedIdentityDeletionProcess {
     status: IdentityDeletionProcessStatus;
     createdAt?: CoreDate;
     createdByDevice?: CoreId;
+    approvalPeriodEndsAt?: CoreDate;
     rejectedAt?: CoreDate;
     rejectedByDevice?: CoreId;
     approvedAt?: CoreDate;
@@ -44,31 +46,35 @@ export class CachedIdentityDeletionProcess extends CoreSerializable implements I
 
     @validate({ nullable: true })
     @serialize()
-    public approvedAt?: CoreDate;
+    public approvalPeriodEndsAt?: CoreDate;
 
     @validate({ nullable: true })
     @serialize()
-    public approvedByDevice?: CoreId;
+    public rejectedAt?: CoreDate;
 
     @validate({ nullable: true })
     @serialize()
-    public gracePeriodEndsAt?: CoreDate;
+    public rejectedByDevice?: CoreId;
 
     @validate({ nullable: true })
     @serialize()
-    public cancelledAt?: CoreDate;
+    public approvedAt?: CoreDate;
 
     @validate({ nullable: true })
     @serialize()
-    public cancelledByDevice?: CoreId;
+    public approvedByDevice?: CoreId;
 
     @validate({ nullable: true })
     @serialize()
-    public rejectedAt?: CoreDate;
+    public gracePeriodEndsAt?: CoreDate;
 
     @validate({ nullable: true })
     @serialize()
-    public rejectedByDevice?: CoreId;
+    public cancelledAt?: CoreDate;
+
+    @validate({ nullable: true })
+    @serialize()
+    public cancelledByDevice?: CoreId;
 
     public static from(value: ICachedIdentityDeletionProcess | CachedIdentityDeletionProcessJSON): CachedIdentityDeletionProcess {
         return this.fromAny(value);

diff --git a/packages/transport/src/modules/accounts/data/IdentityDeletionProcessStatus.ts b/packages/transport/src/modules/accounts/data/IdentityDeletionProcessStatus.ts
@@ -2,6 +2,5 @@ export enum IdentityDeletionProcessStatus {
     WaitingForApproval = "WaitingForApproval",
     Rejected = "Rejected",
     Approved = "Approved",
-    Deleting = "Deleting",
     Cancelled = "Cancelled"
 }