fix: incorporate review comments

nmshd · Jul 12, 2024 · 7890936 · 7890936
1 parent 8405ac7
commit 7890936
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 63 deletions.
diff --git a/apps/enmeshed/assets/i18n/de.json b/apps/enmeshed/assets/i18n/de.json
@@ -1054,21 +1054,6 @@
       "Rejected": "Abgelehnte Kontaktanfrage",
       "Revoked": "Zurückgezogene Kontaktanfrage"
     },
-    "relationshipChange": {
-      "Accepted": "Akzeptierte Anfrage",
-      "Creation": "Eingehen einer Beziehung",
-      "Pending": "Offene Anfrage",
-      "Rejected": "Abgelehnte Anfrage",
-      "request": {
-        "name": "Anfrage zum Ändern einer Beziehung"
-      },
-      "response": {
-        "name": "Antwort zum Ändern einer Beziehung"
-      },
-      "Revoked": "Zurückgezogene Anfrage",
-      "Termination": "Auflösen einer Beziehung",
-      "TerminationCancellation": "Wiederaufnahme einer Beziehung"
-    },
     "requestItem": {
       "AuthenticationRequestItem": {
         "name": "Hat eine Bestätigung angefordert"

diff --git a/apps/enmeshed/assets/i18n/en.json b/apps/enmeshed/assets/i18n/en.json
@@ -1054,21 +1054,6 @@
       "Rejected": "Rejected contact request",
       "Revoked": "Withdrawn contact request"
     },
-    "relationshipChange": {
-      "Accepted": "Accepted relationship change",
-      "Creation": "Relationship Creation",
-      "Pending": "Pending relationship change",
-      "Rejected": "Rejected relationship change",
-      "request": {
-        "name": "Relationship Change Request"
-      },
-      "response": {
-        "name": "Relationship Change Response"
-      },
-      "Revoked": "Revoked relationship change",
-      "Termination": "Relationship Termination",
-      "TerminationCancellation": "Cancellation of Relationship Termination"
-    },
     "requestItem": {
       "AuthenticationRequestItem": {
         "name": "Requested your authentication"

diff --git a/..._runtime_bridge/integration_test/services/facades/consumption/attributes_facade_test.dart b/..._runtime_bridge/integration_test/services/facades/consumption/attributes_facade_test.dart
@@ -895,7 +895,10 @@ void run(EnmeshedRuntime runtime) {
       );
 
       final query = ThirdPartyRelationshipAttributeQuery(
-          key: 'aKey', owner: ThirdPartyRelationshipAttributeQueryOwner.recipient, thirdParty: [thirdPartyAddress]);
+        key: 'aKey',
+        owner: ThirdPartyRelationshipAttributeQueryOwner.recipient,
+        thirdParty: [thirdPartyAddress],
+      );
       final requestItem = ReadAttributeRequestItem(mustBeAccepted: true, query: query);
 
       final senderThirdPartyOwnedRelationshipAttribute = await executeFullRequestAndShareThirdPartyRelationshipAttributeFlow(
@@ -1110,7 +1113,10 @@ void run(EnmeshedRuntime runtime) {
 
       final receivedAttributeResult = await recipient.consumptionServices.attributes.executeThirdPartyRelationshipAttributeQuery(
         query: ThirdPartyRelationshipAttributeQuery(
-            key: 'website', owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty, thirdParty: [account1.address!]),
+          key: 'website',
+          owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty,
+          thirdParty: [account1.address!],
+        ),
       );
 
       expect(receivedAttributeResult, isSuccessful<List<LocalAttributeDTO>>());
@@ -1612,7 +1618,10 @@ void run(EnmeshedRuntime runtime) {
           (await sender.consumptionServices.attributes.getAttribute(attributeId: thirdPartyOwnSharedRelationshipAttribute.id)).value;
 
       final query = ThirdPartyRelationshipAttributeQuery(
-          key: 'aKey', owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty, thirdParty: [thirdPartyAddress]);
+        key: 'aKey',
+        owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty,
+        thirdParty: [thirdPartyAddress],
+      );
       final requestItem = ReadAttributeRequestItem(mustBeAccepted: true, query: query);
 
       final senderThirdPartyOwnedRelationshipAttribute = await executeFullRequestAndShareThirdPartyRelationshipAttributeFlow(
@@ -1643,7 +1652,10 @@ void run(EnmeshedRuntime runtime) {
           (await sender.consumptionServices.attributes.getAttribute(attributeId: thirdPartyOwnSharedRelationshipAttribute.id)).value;
 
       final query = ThirdPartyRelationshipAttributeQuery(
-          key: 'aKey', owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty, thirdParty: [thirdPartyAddress]);
+        key: 'aKey',
+        owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty,
+        thirdParty: [thirdPartyAddress],
+      );
       final requestItem = ReadAttributeRequestItem(mustBeAccepted: true, query: query);
 
       final senderThirdPartyOwnedRelationshipAttribute = await executeFullRequestAndShareThirdPartyRelationshipAttributeFlow(
@@ -1677,7 +1689,10 @@ void run(EnmeshedRuntime runtime) {
           (await sender.consumptionServices.attributes.getAttribute(attributeId: thirdPartyOwnSharedRelationshipAttribute.id)).value;
 
       final query = ThirdPartyRelationshipAttributeQuery(
-          key: 'aKey', owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty, thirdParty: [thirdPartyAddress]);
+        key: 'aKey',
+        owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty,
+        thirdParty: [thirdPartyAddress],
+      );
       final requestItem = ReadAttributeRequestItem(mustBeAccepted: true, query: query);
 
       final senderThirdPartyOwnedRelationshipAttribute = await executeFullRequestAndShareThirdPartyRelationshipAttributeFlow(
@@ -1721,7 +1736,10 @@ void run(EnmeshedRuntime runtime) {
           (await sender.consumptionServices.attributes.getAttribute(attributeId: thirdPartyOwnSharedRelationshipAttribute.id)).value;
 
       final query = ThirdPartyRelationshipAttributeQuery(
-          key: 'aKey', owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty, thirdParty: [thirdPartyAddress]);
+        key: 'aKey',
+        owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty,
+        thirdParty: [thirdPartyAddress],
+      );
       final requestItem = ReadAttributeRequestItem(mustBeAccepted: true, query: query);
 
       final senderThirdPartyOwnedRelationshipAttribute = await executeFullRequestAndShareThirdPartyRelationshipAttributeFlow(

diff --git a/...eshed_runtime_bridge/integration_test/services/facades/transport/account_facade_test.dart b/...eshed_runtime_bridge/integration_test/services/facades/transport/account_facade_test.dart
@@ -23,7 +23,7 @@ void run(EnmeshedRuntime runtime) {
       final identityInfoResult = await session.transportServices.account.getIdentityInfo();
 
       expect(identityInfoResult, isSuccessful<GetIdentityInfoResponse>());
-      final RegExp regExp = RegExp(r'^did:e:[a-zA-Z0-9.-]+:dids:[0-9a-f]{22}$');
+      final regExp = RegExp(r'^did:e:[a-zA-Z0-9.-]+:dids:[0-9a-f]{22}$');
       expect(regExp.hasMatch(identityInfoResult.value.address), true);
       expect(identityInfoResult.value.publicKey.length, equals(82));
     });

diff --git a/...shed_runtime_bridge/integration_test/services/facades/transport/messages_facade_test.dart b/...shed_runtime_bridge/integration_test/services/facades/transport/messages_facade_test.dart
@@ -192,7 +192,7 @@ void run(EnmeshedRuntime runtime) {
   });
 
   group('Message errors', () {
-    const fakeAddress = 'did:e:prod.enmeshed.eu:dids:fef1992c5e529adc413288';
+    const fakeAddress = 'did:e:a-domain:dids:fef1992c5e529adc413288';
     test('should throw correct error for empty "to" in the Message', () async {
       final result = await session1.transportServices.messages.sendMessage(
         recipients: [fakeAddress],

diff --git a/packages/enmeshed_types/lib/src/contents/attribute_query/attribute_query.g.dart b/packages/enmeshed_types/lib/src/contents/attribute_query/attribute_query.g.dart
diff --git a/...shed_types/lib/src/contents/attribute_query/third_party_relationship_attribute_query.dart b/...shed_types/lib/src/contents/attribute_query/third_party_relationship_attribute_query.dart
@@ -1,7 +1,15 @@
 part of 'attribute_query.dart';
 
-enum ThirdPartyRelationshipAttributeQueryOwner { thirdParty, recipient, empty }
+enum ThirdPartyRelationshipAttributeQueryOwner {
+  @JsonValue('thirdParty')
+  thirdParty,
+  @JsonValue('recipient')
+  recipient,
+  @JsonValue('')
+  empty,
+}
 
+@JsonSerializable(includeIfNull: false)
 class ThirdPartyRelationshipAttributeQuery extends AttributeQuery {
   final String key;
   final ThirdPartyRelationshipAttributeQueryOwner owner;
@@ -17,32 +25,10 @@ class ThirdPartyRelationshipAttributeQuery extends AttributeQuery {
     this.validTo,
   });
 
-  factory ThirdPartyRelationshipAttributeQuery.fromJson(Map json) {
-    return ThirdPartyRelationshipAttributeQuery(
-      key: json['key'],
-      owner: json['owner'] == ''
-          ? ThirdPartyRelationshipAttributeQueryOwner.empty
-          : ThirdPartyRelationshipAttributeQueryOwner.values.byName(json['owner']),
-      thirdParty: (json['thirdParty'] as List<dynamic>).map((e) => e as String).toList(),
-      validFrom: json['validTo'],
-      validTo: json['validTo'],
-    );
-  }
+  factory ThirdPartyRelationshipAttributeQuery.fromJson(Map json) => _$ThirdPartyRelationshipAttributeQueryFromJson(Map<String, dynamic>.from(json));
 
   @override
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{
-      '@type': 'ThirdPartyRelationshipAttributeQuery',
-      'key': key,
-      'owner': owner == ThirdPartyRelationshipAttributeQueryOwner.empty ? '' : owner.name,
-      'thirdParty': thirdParty,
-      'validFrom': validFrom,
-      'validTo': validTo,
-    };
-
-    json.removeWhere((key, value) => value == null);
-    return json;
-  }
+  Map<String, dynamic> toJson() => {'@type': 'ThirdPartyRelationshipAttributeQuery', ..._$ThirdPartyRelationshipAttributeQueryToJson(this)};
 
   @override
   List<Object?> get props => [