@bprotsyk/aso-core 1.2.175 → 1.2.177

package/lib/flash/flash-app.d.ts

@@ -43,6 +43,8 @@ export interface IDirectParams {
 export interface IBannerParams {
     dataPath: string;
     imagePath: string;
+    imageParam: string;
+    linkParam: string;
 }
 export interface IRemoveDataParams {
     buttonText: string;

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

@@ -15,6 +15,7 @@ declare function createCampaign(campaignData: Partial<IKeitaroCampaign>): Promis
 declare function getCampaignById(id: number): Promise<IKeitaroCampaign>;
 export declare function upsertStreamToCampaign(campaign: IKeitaroCampaign, stream: Partial<IKeitaroStream>): Promise<void>;
 declare function cloneOWCampaign(app: IFlashApp): Promise<IKeitaroCampaign>;
+declare function changeCampaignsGroup(fromId: number, toId: number, exceptForCampaignIds: number[]): Promise<void>;
 declare function getDomains(onlyActive?: boolean): Promise<IKeitaroDomain[]>;
 export declare const KeitaroService: {
     getStreamsByCampaignId: typeof getStreamsByCampaignId;
@@ -30,5 +31,6 @@ export declare const KeitaroService: {
     upsertStreamToCampaign: typeof upsertStreamToCampaign;
     cloneOWCampaign: typeof cloneOWCampaign;
     updateOffer: typeof updateOffer;
+    changeCampaignsGroup: typeof changeCampaignsGroup;
 };
 export {};

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

@@ -54,11 +54,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) {
+async function createStreamForMatchingCampaigns(streamPartialPayload, offerId, campaignRegExp, onlyInGroup) {
     // Get a list of all campaigns
     const allCampaigns = await getAllCampaigns();
     // Filter the campaigns by the given RegExp
-    const matchingCampaigns = allCampaigns.filter(campaign => campaignRegExp.exec(campaign.name));
+    const matchingCampaigns = allCampaigns.filter(campaign => (onlyInGroup ? campaign.group_id == onlyInGroup : true) && campaignRegExp.exec(campaign.name));
     // console.log(matchingCampaigns)
     // For each matching campaign, clone the streams
     for (const matchingCampaign of matchingCampaigns) {
@@ -167,7 +167,7 @@ async function cloneOWCampaign(app) {
     let matchingCampaign = allCampaigns.filter((c) => c.name.includes(`FA #${app.id}`));
     if (matchingCampaign.length > 0)
         return matchingCampaign[0];
-    const { data: campaigns } = await http_1.default.post(`/campaigns/2448/clone`);
+    const { data: campaigns } = await http_1.default.post(`/campaigns/2687/clone`);
     if (campaigns.length == 0)
         throw Error("Campaign cloning falied");
     let clonedCampaign = campaigns[0];
@@ -185,6 +185,13 @@ async function cloneOWCampaign(app) {
     const { data: campaign } = await http_1.default.put(`/campaigns/${clonedCampaign.id}`, payload);
     return campaign;
 }
+async function changeCampaignsGroup(fromId, toId, exceptForCampaignIds) {
+    let campaigns = await getAllCampaigns();
+    const matchingCampaigns = campaigns.filter(campaign => campaign.group_id == fromId && !exceptForCampaignIds.includes(campaign.id));
+    for (let campaign of matchingCampaigns) {
+        await updateCampaign(campaign.id, { group_id: toId });
+    }
+}
 // Domain
 async function getDomains(onlyActive) {
     const { data: domains } = await http_1.default.get(`/domains`);
@@ -192,5 +199,5 @@ async function getDomains(onlyActive) {
 }
 exports.KeitaroService = {
     getStreamsByCampaignId, updateCampaign, getAllCampaigns, getAllOffers, cloneStreams, addOfferToKeitaro, getOfferByKeitaroId, getDomains, createCampaign, getCampaignById, upsertStreamToCampaign, cloneOWCampaign,
-    updateOffer
+    updateOffer, changeCampaignsGroup
 };

package/lib/utils/keitaro-utils.js

@@ -469,6 +469,18 @@ let findBrokenOfferStreams = async () => {
         }
     }
 };
+let moveCampaignsToAnotherGroup = async () => {
+    let from = 2, to = 80, exceptFor = [2684, 2686, 2673, 2670, 2687, 2689, 2529, 2688, 2551, 2517, 2691, 2588, 2643, 2563, 2598, 2624, 2584, 2553, 2683, 2618, 2499, 2594, 2545, 2682, 2569, 2527, 2681, 2677, 2610, 2608];
+    await keitaro_service_1.KeitaroService.changeCampaignsGroup(from, to, exceptFor);
+};
+moveCampaignsToAnotherGroup();
+// Getting campaign group ids
+// (async () => {
+//     let campaigns = await KeitaroService.getAllCampaigns()
+//     let normal = campaigns.find(c => c.id == 2684)
+//     let archive = campaigns.find(c => c.id == 2679)
+//     console.log([normal?.group_id, archive?.group_id])
+// })()
 // findBrokenOfferStreams()
 // removeBrokenDomain()
 // createFlashCampaigns(sampleApp)

package/package.json

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

package/src/flash/flash-app.ts

@@ -53,7 +53,9 @@ export interface IDirectParams {
 
 export interface IBannerParams {
     dataPath: string,
-    imagePath: string
+    imagePath: string,
+    imageParam: string,
+    linkParam: string
 }
 
 export interface IRemoveDataParams {

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

@@ -63,12 +63,12 @@ async function updateCampaign(id: number, payload: Partial<IKeitaroCampaign>) {
     await keitaroApi.put(`campaigns/${id}`, payload)
 }
 
-async function createStreamForMatchingCampaigns(streamPartialPayload: any, offerId: string, campaignRegExp: RegExp) {
+async function createStreamForMatchingCampaigns(streamPartialPayload: any, offerId: string, campaignRegExp: RegExp, onlyInGroup?: number) {
     // Get a list of all campaigns
     const allCampaigns = await getAllCampaigns()
 
     // Filter the campaigns by the given RegExp
-    const matchingCampaigns = allCampaigns.filter(campaign => campaignRegExp.exec(campaign.name));
+    const matchingCampaigns = allCampaigns.filter(campaign => (onlyInGroup ? campaign.group_id == onlyInGroup : true) && campaignRegExp.exec(campaign.name));
     // console.log(matchingCampaigns)
 
 
@@ -198,7 +198,7 @@ async function cloneOWCampaign(app: IFlashApp): Promise<IKeitaroCampaign> {
     let matchingCampaign = allCampaigns.filter((c) => c.name.includes(`FA #${app.id}`))
     if (matchingCampaign.length > 0) return matchingCampaign[0]
 
-    const { data: campaigns } = await keitaroApi.post(`/campaigns/2448/clone`);
+    const { data: campaigns } = await keitaroApi.post(`/campaigns/2687/clone`);
 
     if (campaigns.length == 0) throw Error("Campaign cloning falied")
 
@@ -223,6 +223,15 @@ async function cloneOWCampaign(app: IFlashApp): Promise<IKeitaroCampaign> {
     return campaign
 }
 
+async function changeCampaignsGroup(fromId: number, toId: number, exceptForCampaignIds: number[]) {
+    let campaigns = await getAllCampaigns()
+    const matchingCampaigns = campaigns.filter(campaign => campaign.group_id == fromId && !exceptForCampaignIds.includes(campaign.id))
+
+    for (let campaign of matchingCampaigns) {
+        await updateCampaign(campaign.id, { group_id: toId })
+    }
+}
+
 // Domain
 async function getDomains(onlyActive?: boolean): Promise<IKeitaroDomain[]> {
     const { data: domains } = await keitaroApi.get<IKeitaroDomain[]>(`/domains`)
@@ -231,5 +240,5 @@ async function getDomains(onlyActive?: boolean): Promise<IKeitaroDomain[]> {
 
 export const KeitaroService = {
     getStreamsByCampaignId, updateCampaign, getAllCampaigns, getAllOffers, cloneStreams, addOfferToKeitaro, getOfferByKeitaroId, getDomains, createCampaign, getCampaignById, upsertStreamToCampaign, cloneOWCampaign,
-    updateOffer
-}
+    updateOffer, changeCampaignsGroup
+}

package/src/utils/keitaro-utils.ts

@@ -533,6 +533,23 @@ let findBrokenOfferStreams = async () => {
     } 
 }
 
+let moveCampaignsToAnotherGroup = async () => {
+    let from = 2, to = 80, exceptFor = [2684, 2686, 2673, 2670, 2687, 2689, 2529, 2688, 2551, 2517, 2691, 2588, 2643, 2563, 2598, 2624, 2584, 2553, 2683, 2618, 2499, 2594, 2545, 2682, 2569, 2527, 2681, 2677, 2610, 2608]
+    
+    await KeitaroService.changeCampaignsGroup(from, to, exceptFor)
+} 
+
+moveCampaignsToAnotherGroup()
+
+// Getting campaign group ids
+// (async () => {
+//     let campaigns = await KeitaroService.getAllCampaigns()
+//     let normal = campaigns.find(c => c.id == 2684)
+//     let archive = campaigns.find(c => c.id == 2679)
+
+//     console.log([normal?.group_id, archive?.group_id])
+// })()
+
 // findBrokenOfferStreams()
 
 // removeBrokenDomain()
@@ -544,4 +561,5 @@ let findBrokenOfferStreams = async () => {
 
 // gatherInfoForFlashApps()
 
-// replaceDomainInOffers(`xmariorel.com`, `veemienasorullf.com`, /Icecasino Huffson.*/g)
+// replaceDomainInOffers(`xmariorel.com`, `veemienasorullf.com`, /Icecasino Huffson.*/g)
+