@icure/api 8.8.0 → 8.8.1

package/icc-x-api/icc-contact-x-api.d.ts

@@ -497,4 +497,35 @@ export declare class IccContactXApi extends IccContactApi implements EncryptedEn
      * @return a promise that completes when the metadata is created/updated
      */
     createDelegationDeAnonymizationMetadata(entity: Contact, delegates: string[]): Promise<void>;
+    /**
+     * Like {@link getConflictsForEntity} but additionally decrypts the conflicting revisions for the given user.
+     * @param user the current user, used to determine the data owner that will decrypt the entities.
+     * @param entityId the id of the contact to retrieve the conflicts for.
+     * @return the decrypted conflicting revisions of the contact.
+     */
+    getConflictsForEntityWithUser(user: models.User, entityId: string): Promise<Array<models.Contact>>;
+    /**
+     * Like {@link declareConflictWinner} but encrypts the winning revision before sending it and decrypts the saved
+     * winner returned by the backend.
+     * @param user the current user, used to determine the data owner that will encrypt/decrypt the entity.
+     * @param request the {@link models.ConflictResolutionRequest} carrying the (decrypted) winning revision and the conflicts to purge.
+     * @return the {@link models.ConflictResolutionResult} with the decrypted saved winner and the conflicts that are still unresolved.
+     */
+    declareConflictWinnerWithUser(user: models.User, request: models.ConflictResolutionRequest<models.Contact>): Promise<models.ConflictResolutionResult<models.Contact>>;
+    /**
+     * Like {@link getConflictsForEntityWithUser} but targets the entity of the group with the given id.
+     * @param user the current user, used to determine the data owner that will decrypt the entities.
+     * @param groupId the id of the group the contact belongs to.
+     * @param entityId the id of the contact to retrieve the conflicts for.
+     * @return the decrypted conflicting revisions of the contact.
+     */
+    getConflictsForEntityInGroupWithUser(user: models.User, groupId: string, entityId: string): Promise<Array<models.Contact>>;
+    /**
+     * Like {@link declareConflictWinnerWithUser} but targets the entity of the group with the given id.
+     * @param user the current user, used to determine the data owner that will encrypt/decrypt the entity.
+     * @param groupId the id of the group the contact belongs to.
+     * @param request the {@link models.ConflictResolutionRequest} carrying the (decrypted) winning revision and the conflicts to purge.
+     * @return the {@link models.ConflictResolutionResult} with the decrypted saved winner and the conflicts that are still unresolved.
+     */
+    declareConflictWinnerInGroupWithUser(user: models.User, groupId: string, request: models.ConflictResolutionRequest<models.Contact>): Promise<models.ConflictResolutionResult<models.Contact>>;
 }

package/icc-x-api/icc-contact-x-api.js

@@ -501,7 +501,9 @@ class IccContactXApi extends icc_api_1.IccContactApi {
         let latestService;
         ctcs.forEach((c) => {
             const s = c.services.find((it) => svcId === it.id);
-            if (s && (!latestService || (0, date_fns_1.isAfter)((0, date_fns_1.parse)('' + s.valueDate, 'yyyyMMddHHmmss', new Date()), (0, date_fns_1.parse)('' + latestService.valueDate, 'yyyyMMddHHmmss', new Date())))) {
+            if (s &&
+                (!latestService ||
+                    (0, date_fns_1.isAfter)((0, date_fns_1.parse)('' + s.valueDate, 'yyyyMMddHHmmss', new Date()), (0, date_fns_1.parse)('' + latestService.valueDate, 'yyyyMMddHHmmss', new Date())))) {
                 latestContact = c;
                 latestService = s;
             }
@@ -1070,6 +1072,63 @@ class IccContactXApi extends icc_api_1.IccContactApi {
     createDelegationDeAnonymizationMetadata(entity, delegates) {
         return this.crypto.delegationsDeAnonymization.createOrUpdateDeAnonymizationInfo({ entity, type: utils_1.EntityWithDelegationTypeName.Contact }, delegates);
     }
+    /**
+     * Like {@link getConflictsForEntity} but additionally decrypts the conflicting revisions for the given user.
+     * @param user the current user, used to determine the data owner that will decrypt the entities.
+     * @param entityId the id of the contact to retrieve the conflicts for.
+     * @return the decrypted conflicting revisions of the contact.
+     */
+    getConflictsForEntityWithUser(user, entityId) {
+        return super.getConflictsForEntity(entityId).then((cs) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), cs));
+    }
+    /**
+     * Like {@link declareConflictWinner} but encrypts the winning revision before sending it and decrypts the saved
+     * winner returned by the backend.
+     * @param user the current user, used to determine the data owner that will encrypt/decrypt the entity.
+     * @param request the {@link models.ConflictResolutionRequest} carrying the (decrypted) winning revision and the conflicts to purge.
+     * @return the {@link models.ConflictResolutionResult} with the decrypted saved winner and the conflicts that are still unresolved.
+     */
+    declareConflictWinnerWithUser(user, request) {
+        const _super = Object.create(null, {
+            declareConflictWinner: { get: () => super.declareConflictWinner }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const encrypted = (yield this.encrypt(user, [(0, collection_utils_1.cloneDeep)(request.document)]))[0];
+            const result = yield _super.declareConflictWinner.call(this, Object.assign(Object.assign({}, request), { document: encrypted }));
+            if (result.document)
+                result.document = (yield this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), [result.document]))[0];
+            return result;
+        });
+    }
+    /**
+     * Like {@link getConflictsForEntityWithUser} but targets the entity of the group with the given id.
+     * @param user the current user, used to determine the data owner that will decrypt the entities.
+     * @param groupId the id of the group the contact belongs to.
+     * @param entityId the id of the contact to retrieve the conflicts for.
+     * @return the decrypted conflicting revisions of the contact.
+     */
+    getConflictsForEntityInGroupWithUser(user, groupId, entityId) {
+        return super.getConflictsForEntityInGroup(groupId, entityId).then((cs) => this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), cs));
+    }
+    /**
+     * Like {@link declareConflictWinnerWithUser} but targets the entity of the group with the given id.
+     * @param user the current user, used to determine the data owner that will encrypt/decrypt the entity.
+     * @param groupId the id of the group the contact belongs to.
+     * @param request the {@link models.ConflictResolutionRequest} carrying the (decrypted) winning revision and the conflicts to purge.
+     * @return the {@link models.ConflictResolutionResult} with the decrypted saved winner and the conflicts that are still unresolved.
+     */
+    declareConflictWinnerInGroupWithUser(user, groupId, request) {
+        const _super = Object.create(null, {
+            declareConflictWinnerInGroup: { get: () => super.declareConflictWinnerInGroup }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const encrypted = (yield this.encrypt(user, [(0, collection_utils_1.cloneDeep)(request.document)]))[0];
+            const result = yield _super.declareConflictWinnerInGroup.call(this, groupId, Object.assign(Object.assign({}, request), { document: encrypted }));
+            if (result.document)
+                result.document = (yield this.decrypt(this.dataOwnerApi.getDataOwnerIdOf(user), [result.document]))[0];
+            return result;
+        });
+    }
 }
 exports.IccContactXApi = IccContactXApi;
 //# sourceMappingURL=icc-contact-x-api.js.map