@comet/brevo-api 2.0.0-canary-20240618072535 → 2.0.0-canary-20240711123618

package/lib/target-group/target-groups.service.js

@@ -59,20 +59,24 @@ let TargetGroupsService = class TargetGroupsService {
         }
         return true;
     }
-    assignContactsToContactList(filters = {}, brevoId, scope) {
+    assignContactsToContactList(filters = {}, targetGroup, scope) {
         return __awaiter(this, void 0, void 0, function* () {
             const mainScopeTargetGroupList = yield this.repository.findOneOrFail({ scope, isMainList: true });
             let offset = 0;
             let totalCount = 0;
             do {
-                const [contacts, totalContacts] = yield this.brevoApiContactsService.findContactsByListId(mainScopeTargetGroupList.brevoId, 50, offset);
+                const [contacts, totalContacts] = yield this.brevoApiContactsService.findContactsByListId(mainScopeTargetGroupList.brevoId, 50, offset, scope);
                 totalCount = totalContacts;
                 offset += contacts.length;
                 const contactsInContactList = [];
                 const contactsNotInContactList = [];
                 for (const contact of contacts) {
-                    const contactIsInTargetGroup = this.checkIfContactIsInTargetGroup(contact.attributes, filters);
-                    if (contactIsInTargetGroup) {
+                    const contactIsInTargetGroupByFilters = this.checkIfContactIsInTargetGroup(contact.attributes, filters);
+                    const manuallyAssignedTargetGroup = targetGroup.assignedContactsTargetGroupBrevoId;
+                    const contactIsManuallyAssignedToTargetGroup = manuallyAssignedTargetGroup
+                        ? contact.listIds.includes(manuallyAssignedTargetGroup)
+                        : false;
+                    if (contactIsInTargetGroupByFilters || contactIsManuallyAssignedToTargetGroup) {
                         contactsInContactList.push(contact);
                     }
                     else {
@@ -80,10 +84,10 @@ let TargetGroupsService = class TargetGroupsService {
                     }
                 }
                 if (contactsInContactList.length > 0) {
-                    yield this.brevoApiContactsService.updateMultipleContacts(contactsInContactList.map((contact) => ({ id: contact.id, listIds: [brevoId] })));
+                    yield this.brevoApiContactsService.updateMultipleContacts(contactsInContactList.map((contact) => ({ id: contact.id, listIds: [targetGroup.brevoId] })), scope);
                 }
                 if (contactsNotInContactList.length > 0) {
-                    yield this.brevoApiContactsService.updateMultipleContacts(contactsNotInContactList.map((contact) => ({ id: contact.id, unlinkListIds: [brevoId] })));
+                    yield this.brevoApiContactsService.updateMultipleContacts(contactsNotInContactList.map((contact) => ({ id: contact.id, unlinkListIds: [targetGroup.brevoId] })), scope);
                 }
             } while (offset < totalCount);
             return true;
@@ -95,12 +99,6 @@ let TargetGroupsService = class TargetGroupsService {
             return [targetGroups, totalContactLists];
         });
     }
-    findOneTargetGroup(where) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const targetGroup = yield this.repository.findOne(where);
-            return targetGroup;
-        });
-    }
     createIfNotExistMainTargetGroupForScope(scope) {
         return __awaiter(this, void 0, void 0, function* () {
             const mainList = yield this.repository.findOne({ scope, isMainList: true });
@@ -108,7 +106,7 @@ let TargetGroupsService = class TargetGroupsService {
                 return mainList;
             }
             const title = "Main list for current scope";
-            const brevoId = yield this.brevoApiContactsService.createBrevoContactList({ title });
+            const brevoId = yield this.brevoApiContactsService.createBrevoContactList(title, scope);
             if (brevoId) {
                 const mainTargetGroupForScope = this.repository.create({ title, brevoId, scope, isMainList: true });
                 yield this.entityManager.flush();

package/lib/target-group/target-groups.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"target-groups.service.js","sourceRoot":"","sources":["../../src/target-group/target-groups.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"target-groups.service.js","sourceRoot":"","sources":["../../src/target-group/target-groups.service.ts"],"names":[],"mappings":"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"}