@bprotsyk/aso-core 2.1.17 → 2.1.19

package/lib/network/keitaro/keitaro-service.d.ts

@@ -17,7 +17,7 @@ declare function getAllOffers(): Promise<IKeitaroOffer[]>;
 declare function findKeitaroOffers(filter: IKeitaroOffersFilter): Promise<IKeitaroOffer[]>;
 declare function getOfferByKeitaroId(id: number): Promise<IKeitaroOffer>;
 declare function updateOffer(offer: any): Promise<IKeitaroOffer>;
-declare function addOfferToKeitaro(offer: IOffer, affiliateId: number, link: string, campaignGroupIds?: number[], groupId?: number): Promise<void>;
+declare function addOfferToKeitaro(offer: IOffer, affiliateId: number, link: string, avoidGroup?: number, groupId?: number): Promise<void>;
 declare function createCampaign(campaignData: Partial<IKeitaroCampaign>): Promise<IKeitaroCampaign>;
 declare function getCampaignById(id: number): Promise<IKeitaroCampaign>;
 export declare function upsertStreamToCampaign(campaign: IKeitaroCampaign, stream: Partial<IKeitaroStream>): Promise<void>;

package/lib/network/keitaro/keitaro-service.js

@@ -55,11 +55,11 @@ async function cloneStreams(originalCampaignId, streamPositionsToClone, campaign
 async function updateCampaign(id, payload) {
     await http_1.default.put(`campaigns/${id}`, payload);
 }
-async function createStreamForMatchingCampaigns(streamPartialPayload, offerId, campaignRegExp, onlyInGroups) {
+async function createStreamForMatchingCampaigns(streamPartialPayload, offerId, campaignRegExp, avoidGroup) {
     // Get a list of all campaigns
     const allCampaigns = await getAllCampaigns();
     // Filter the campaigns by the given RegExp
-    const matchingCampaigns = allCampaigns.filter(campaign => (onlyInGroups ? onlyInGroups.includes(campaign.group_id) : true) && campaignRegExp.exec(campaign.name));
+    const matchingCampaigns = allCampaigns.filter(campaign => (avoidGroup ? campaign.group_id != avoidGroup : true) && campaignRegExp.exec(campaign.name));
     // console.log(matchingCampaigns)
     // For each matching campaign, clone the streams
     for (const matchingCampaign of matchingCampaigns) {
@@ -120,7 +120,7 @@ function createStreamPartialPayload(keitaroOfferId, offerName, offerId, offerGeo
             }],
     };
 }
-async function addOfferToKeitaro(offer, affiliateId, link, campaignGroupIds, groupId) {
+async function addOfferToKeitaro(offer, affiliateId, link, avoidGroup, groupId) {
     // TODO look if offer already exists by offer.name
     let allOffers = await getAllOffers();
     let identicalOffer = allOffers.find((o) => { return o.name.includes(offer.name); });
@@ -144,7 +144,7 @@ async function addOfferToKeitaro(offer, affiliateId, link, campaignGroupIds, gro
         keitaroOfferId = keitaroOffer.id;
     }
     let streamPartialPayload = createStreamPartialPayload(keitaroOfferId, offer.caption, offer.name, offer.geo);
-    await createStreamForMatchingCampaigns(streamPartialPayload, offer.name, /^(FA #|A #)/, campaignGroupIds);
+    await createStreamForMatchingCampaigns(streamPartialPayload, offer.name, /^(#)/, avoidGroup);
 }
 async function createCampaign(campaignData) {
     let { data: campaign } = await http_1.default.post(`/campaigns`, campaignData);

package/lib/utils/keitaro-utils.js

@@ -391,14 +391,14 @@ async function createOWCampaign(app) {
 exports.createOWCampaign = createOWCampaign;
 // TODO separate files for offers, campaigns etc.
 let removeBrokenDomain = async () => {
-    let regexp = new RegExp(`^FA #`);
+    let regexp = new RegExp(`^#`);
     let campaigns = (await keitaro_service_1.KeitaroService.getAllCampaigns()).filter(campaign => regexp.exec(campaign.name) && campaign.domain == "https://slottibolt.com/");
     for (let campaign of campaigns) {
         console.log(campaign.name);
     }
 };
 let changeSourceForFA = async () => {
-    let regexp = new RegExp(`^FA #`);
+    let regexp = new RegExp(`^#`);
     let campaigns = (await keitaro_service_1.KeitaroService.getAllCampaigns()).filter(campaign => regexp.exec(campaign.name));
     for (let campaign of campaigns) {
         console.log(campaign.name);
@@ -502,7 +502,7 @@ let replaceInOfferLink = async (old, replace, offerNameRegEx) => {
 // }
 let findBrokenOfferStreams = async () => {
     let allCampaigns = await keitaro_service_1.KeitaroService.getAllCampaigns();
-    let regexp = new RegExp(`^FA #`);
+    let regexp = new RegExp(`^#`);
     const matchingCampaigns = allCampaigns.filter(campaign => regexp.exec(campaign.name));
     for (let campaign of matchingCampaigns) {
         console.log(campaign.name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bprotsyk/aso-core",
-  "version": "2.1.17",
+  "version": "2.1.19",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {

package/src/network/keitaro/keitaro-service.ts

@@ -71,12 +71,12 @@ async function updateCampaign(id: number, payload: Partial<IKeitaroCampaign>) {
     await keitaroApi.put(`campaigns/${id}`, payload)
 }
 
-async function createStreamForMatchingCampaigns(streamPartialPayload: any, offerId: string, campaignRegExp: RegExp, onlyInGroups?: number[]) {
+async function createStreamForMatchingCampaigns(streamPartialPayload: any, offerId: string, campaignRegExp: RegExp, avoidGroup?: number) {
     // Get a list of all campaigns
     const allCampaigns = await getAllCampaigns()
 
     // Filter the campaigns by the given RegExp
-    const matchingCampaigns = allCampaigns.filter(campaign => (onlyInGroups ? onlyInGroups.includes(campaign.group_id) : true) && campaignRegExp.exec(campaign.name));
+    const matchingCampaigns = allCampaigns.filter(campaign => (avoidGroup ? campaign.group_id != avoidGroup : true) && campaignRegExp.exec(campaign.name));
     // console.log(matchingCampaigns)
 
 
@@ -149,7 +149,7 @@ function createStreamPartialPayload(keitaroOfferId: number, offerName: string, o
     }
 }
 
-async function addOfferToKeitaro(offer: IOffer, affiliateId: number, link: string, campaignGroupIds?: number[], groupId?: number) {
+async function addOfferToKeitaro(offer: IOffer, affiliateId: number, link: string, avoidGroup?: number, groupId?: number) {
     // TODO look if offer already exists by offer.name
     let allOffers = await getAllOffers()
     let identicalOffer = allOffers.find((o) => { return o.name.includes(offer.name) })
@@ -177,7 +177,7 @@ async function addOfferToKeitaro(offer: IOffer, affiliateId: number, link: strin
 
     let streamPartialPayload = createStreamPartialPayload(keitaroOfferId, offer.caption, offer.name, offer.geo)
 
-    await createStreamForMatchingCampaigns(streamPartialPayload, offer.name, /^(FA #|A #)/, campaignGroupIds)
+    await createStreamForMatchingCampaigns(streamPartialPayload, offer.name, /^(#)/, avoidGroup)
 }
 
 async function createCampaign(campaignData: Partial<IKeitaroCampaign>): Promise<IKeitaroCampaign> {

package/src/utils/keitaro-utils.ts

@@ -440,7 +440,7 @@ export async function createOWCampaign(app: IApp) {
 
 let removeBrokenDomain = async () => {
 
-    let regexp = new RegExp(`^FA #`)
+    let regexp = new RegExp(`^#`)
     let campaigns = (await KeitaroService.getAllCampaigns()).filter(campaign => regexp.exec(campaign.name) && campaign.domain == "https://slottibolt.com/");
     for (let campaign of campaigns) {
         console.log(campaign.name)
@@ -448,7 +448,7 @@ let removeBrokenDomain = async () => {
 }
 
 let changeSourceForFA = async () => {
-    let regexp = new RegExp(`^FA #`)
+    let regexp = new RegExp(`^#`)
     let campaigns = (await KeitaroService.getAllCampaigns()).filter(campaign => regexp.exec(campaign.name));
     for (let campaign of campaigns) {
         console.log(campaign.name)
@@ -578,7 +578,7 @@ let replaceInOfferLink = async (old: string, replace: string, offerNameRegEx: Re
 let findBrokenOfferStreams = async () => {
     let allCampaigns = await KeitaroService.getAllCampaigns()
 
-    let regexp = new RegExp(`^FA #`)
+    let regexp = new RegExp(`^#`)
     const matchingCampaigns = allCampaigns.filter(campaign => regexp.exec(campaign.name));
     for (let campaign of matchingCampaigns) {
         console.log(campaign.name)