@bprotsyk/aso-core 2.1.31 → 2.1.32

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

@@ -26,7 +26,6 @@ declare function cloneDCampaign(app: IApp): Promise<IKeitaroCampaign>;
 declare function changeCampaignsGroup(fromId: number, toId: number, exceptForCampaignIds: number[], onlyForCampaignIds?: number[]): Promise<void>;
 declare function getDomains(onlyActive?: boolean): Promise<IKeitaroDomain[]>;
 declare function getProfitForTimeRange(from: number, to: number): Promise<number>;
-declare function getProfitForTodayAndYesterday(): Promise<any>;
 export declare const KeitaroService: {
     getStreamsByCampaignId: typeof getStreamsByCampaignId;
     updateCampaign: typeof updateCampaign;
@@ -43,7 +42,6 @@ export declare const KeitaroService: {
     updateOffer: typeof updateOffer;
     changeCampaignsGroup: typeof changeCampaignsGroup;
     getProfitForTimeRange: typeof getProfitForTimeRange;
-    getProfitForTodayAndYesterday: typeof getProfitForTodayAndYesterday;
     cloneDCampaign: typeof cloneDCampaign;
     findKeitaroOffers: typeof findKeitaroOffers;
 };

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

@@ -173,9 +173,9 @@ async function upsertStreamToCampaign(campaign, stream) {
 }
 exports.upsertStreamToCampaign = upsertStreamToCampaign;
 async function cloneOWCampaign(app) {
-    let name = `#${app.id} [◈])`;
+    let name = `#${app.id} [◈]`;
     let allCampaigns = await getAllCampaigns();
-    let matchingCampaign = allCampaigns.filter((c) => c.name.includes(`#${app.id} [◈]`));
+    let matchingCampaign = allCampaigns.filter((c) => new RegExp(`#${app.id}.*◈`).test(c.name));
     if (matchingCampaign.length > 0)
         return matchingCampaign[0];
     const { data: campaigns } = await http_1.default.post(`/campaigns/2673/clone`);
@@ -246,16 +246,18 @@ async function getProfitForTimeRange(from, to) {
     });
     return data.rows[0].profit;
 }
-async function getProfitForTodayAndYesterday() {
-    let timestamps = (0, general_1.getTimestampsForTodayAndYesterday)();
-    let today = await exports.KeitaroService.getProfitForTimeRange(timestamps.today.start, timestamps.today.end);
-    let yesterday = await exports.KeitaroService.getProfitForTimeRange(timestamps.yesterday.start, timestamps.yesterday.end);
-    return {
-        today: today,
-        yesterday: yesterday
-    };
-}
+// async function getProfitForTodayAndYesterday(): Promise<any> {
+//     let timestamps = getTimestampsForTodayAndYesterday()
+//     let today = await KeitaroService.getProfitForTimeRange(timestamps.today.start, timestamps.today.end)
+//     let yesterday = await KeitaroService.getProfitForTimeRange(timestamps.yesterday.start, timestamps.yesterday.end)
+//     return {
+//         today: today,
+//         yesterday: yesterday
+//     }
+// }
 exports.KeitaroService = {
     getStreamsByCampaignId, updateCampaign, getAllCampaigns, getAllOffers, cloneStreams, addOfferToKeitaro, getOfferByKeitaroId, getDomains, createCampaign, getCampaignById, upsertStreamToCampaign, cloneOWCampaign,
-    updateOffer, changeCampaignsGroup, getProfitForTimeRange, getProfitForTodayAndYesterday, cloneDCampaign, findKeitaroOffers
+    updateOffer, changeCampaignsGroup, getProfitForTimeRange,
+    // getProfitForTodayAndYesterday, 
+    cloneDCampaign, findKeitaroOffers
 };

package/lib/utils/keitaro-utils.js

@@ -565,5 +565,5 @@ let renameCampaigns = async () => {
 // gatherInfoForFlashApps()
 // replaceInOfferLink(`xmariorel.com`, `lalielynaualish.com`, /.*icecasino_huffson.*/g)
 // replaceInOfferLink(`lp=18`, `lp=00`, /.*icecasino_huffson.*/g)
-let test = async () => console.log(await keitaro_service_1.KeitaroService.getProfitForTodayAndYesterday());
-test();
+// let test = async () => console.log(await KeitaroService.getProfitForTodayAndYesterday())
+// test()

package/package.json

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

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

@@ -211,10 +211,10 @@ export async function upsertStreamToCampaign(campaign: IKeitaroCampaign, stream:
 }
 
 async function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign> {
-    let name = `#${app.id} [◈])`
+    let name = `#${app.id} [◈]`
 
     let allCampaigns = await getAllCampaigns()
-    let matchingCampaign = allCampaigns.filter((c) => c.name.includes(`#${app.id} [◈]`))
+    let matchingCampaign = allCampaigns.filter((c) => new RegExp(`#${app.id}.*◈`).test(c.name))
     if (matchingCampaign.length > 0) return matchingCampaign[0]
 
     const { data: campaigns } = await keitaroApi.post(`/campaigns/2673/clone`);
@@ -306,18 +306,20 @@ async function getProfitForTimeRange(from: number, to: number): Promise<number>
     return data.rows[0].profit
 }
 
-async function getProfitForTodayAndYesterday(): Promise<any> {
-    let timestamps = getTimestampsForTodayAndYesterday()
-    let today = await KeitaroService.getProfitForTimeRange(timestamps.today.start, timestamps.today.end)
-    let yesterday = await KeitaroService.getProfitForTimeRange(timestamps.yesterday.start, timestamps.yesterday.end)
+// async function getProfitForTodayAndYesterday(): Promise<any> {
+//     let timestamps = getTimestampsForTodayAndYesterday()
+//     let today = await KeitaroService.getProfitForTimeRange(timestamps.today.start, timestamps.today.end)
+//     let yesterday = await KeitaroService.getProfitForTimeRange(timestamps.yesterday.start, timestamps.yesterday.end)
 
-    return {
-        today: today,
-        yesterday: yesterday
-    }
-}
+//     return {
+//         today: today,
+//         yesterday: yesterday
+//     }
+// }
 
 export const KeitaroService = {
     getStreamsByCampaignId, updateCampaign, getAllCampaigns, getAllOffers, cloneStreams, addOfferToKeitaro, getOfferByKeitaroId, getDomains, createCampaign, getCampaignById, upsertStreamToCampaign, cloneOWCampaign,
-    updateOffer, changeCampaignsGroup, getProfitForTimeRange, getProfitForTodayAndYesterday, cloneDCampaign, findKeitaroOffers
+    updateOffer, changeCampaignsGroup, getProfitForTimeRange, 
+    // getProfitForTodayAndYesterday, 
+    cloneDCampaign, findKeitaroOffers
 }

package/src/utils/keitaro-utils.ts

@@ -660,5 +660,5 @@ let renameCampaigns = async () => {
 
 // replaceInOfferLink(`xmariorel.com`, `lalielynaualish.com`, /.*icecasino_huffson.*/g)
 // replaceInOfferLink(`lp=18`, `lp=00`, /.*icecasino_huffson.*/g)
-let test = async () => console.log(await KeitaroService.getProfitForTodayAndYesterday())
-test()
+// let test = async () => console.log(await KeitaroService.getProfitForTodayAndYesterday())
+// test()