@bprotsyk/aso-core 1.2.193 → 1.2.195

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

@@ -124,8 +124,6 @@ export declare const FlashAppSchema: mongoose.Schema<any, mongoose.Model<any, an
     bundle: string;
     trackingUrl: string;
     geos: string;
-    onesignalAppId: string;
-    onesignalRestApiKey: string;
     integrationVersion: string;
     name?: string | undefined;
     webInterfaceName?: string | undefined;
@@ -138,6 +136,8 @@ export declare const FlashAppSchema: mongoose.Schema<any, mongoose.Model<any, an
     bannerParams?: any;
     directParams?: any;
     policyUrl?: string | undefined;
+    onesignalAppId?: string | undefined;
+    onesignalRestApiKey?: string | undefined;
     linkPath?: string | undefined;
     generationOptions?: {
         splashName?: string | undefined;

package/lib/flash/flash-app.js

@@ -59,18 +59,18 @@ exports.FlashAppSchema = new mongoose_1.Schema({
     },
     onesignalAppId: {
         type: String,
-        required: true
+        required: false
     },
     onesignalRestApiKey: {
         type: String,
-        required: true
+        required: false
     },
     linkPath: {
         type: String
     },
     integrationVersion: {
         type: String,
-        default: IntegrationVersion.MVVM,
+        default: IntegrationVersion.OFFER_STUB,
         enum: IntegrationVersion
     },
     integrationAlterations: Object,

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

@@ -17,6 +17,8 @@ export declare function upsertStreamToCampaign(campaign: IKeitaroCampaign, strea
 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[]>;
+declare function getProfitForTimeRange(from: number, to: number): Promise<number>;
+declare function getProfitForTodayAndYesterday(): Promise<any>;
 export declare const KeitaroService: {
     getStreamsByCampaignId: typeof getStreamsByCampaignId;
     updateCampaign: typeof updateCampaign;
@@ -32,5 +34,7 @@ export declare const KeitaroService: {
     cloneOWCampaign: typeof cloneOWCampaign;
     updateOffer: typeof updateOffer;
     changeCampaignsGroup: typeof changeCampaignsGroup;
+    getProfitForTimeRange: typeof getProfitForTimeRange;
+    getProfitForTodayAndYesterday: typeof getProfitForTodayAndYesterday;
 };
 export {};

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeitaroService = exports.upsertStreamToCampaign = void 0;
 const http_1 = __importDefault(require("./http"));
 const keitaro_utils_1 = require("../../utils/keitaro-utils");
+const general_1 = require("../../utils/general");
 async function getStreamsByCampaignId(campaignId) {
     const { data: streams } = await http_1.default.get(`campaigns/${campaignId}/streams`);
     return streams;
@@ -197,7 +198,29 @@ async function getDomains(onlyActive) {
     const { data: domains } = await http_1.default.get(`/domains`);
     return onlyActive ? domains.filter((d) => d.network_status == "active") : domains;
 }
+async function getProfitForTimeRange(from, to) {
+    let fromString = (0, general_1.convertMillisToDate)(from);
+    let toString = (0, general_1.convertMillisToDate)(to);
+    let { data: data } = await http_1.default.post(`/report/build`, {
+        range: {
+            from: fromString,
+            to: toString,
+            timezone: 'Europe/Madrid'
+        },
+        metrics: ['profit']
+    });
+    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 yeterday = await exports.KeitaroService.getProfitForTimeRange(timestamps.yesterday.start, timestamps.yesterday.end);
+    return {
+        today: today,
+        yesterday: yeterday
+    };
+}
 exports.KeitaroService = {
     getStreamsByCampaignId, updateCampaign, getAllCampaigns, getAllOffers, cloneStreams, addOfferToKeitaro, getOfferByKeitaroId, getDomains, createCampaign, getCampaignById, upsertStreamToCampaign, cloneOWCampaign,
-    updateOffer, changeCampaignsGroup
+    updateOffer, changeCampaignsGroup, getProfitForTimeRange, getProfitForTodayAndYesterday
 };

package/lib/panel/flash/upsert-flash-app-request.d.ts

@@ -1,13 +1,13 @@
 import { IAppGenerationOptions, IAppKeitaroData, IBannerParams, IDeveloperParams, IDirectParams, IDomainParams, IOffersStubParams, IPrivacyPolicyParams, IRemoveDataParams, IntegrationVersion } from "flash/flash-app";
 export interface IUpsertFlashAppRequest {
     id: number;
-    name: string;
-    bundle: string;
+    name?: string;
+    bundle?: string;
     sourceUrl?: string;
-    enabled: boolean;
-    geos: string;
+    enabled?: boolean;
+    geos?: string;
     policyUrl?: string;
-    integrationVersion: IntegrationVersion;
+    integrationVersion?: IntegrationVersion;
     webInterfaceName?: string;
     generationOptions?: Partial<IAppGenerationOptions>;
     keitaroData?: Partial<IAppKeitaroData>;

package/lib/utils/general.d.ts

@@ -0,0 +1,11 @@
+export declare function convertMillisToDate(millis: number): string;
+export declare function getTimestampsForTodayAndYesterday(): {
+    today: {
+        start: number;
+        end: number;
+    };
+    yesterday: {
+        start: number;
+        end: number;
+    };
+};

package/lib/utils/general.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTimestampsForTodayAndYesterday = exports.convertMillisToDate = void 0;
+function convertMillisToDate(millis) {
+    const date = new Date(millis);
+    const year = date.getFullYear();
+    const month = (date.getMonth() + 1).toString().padStart(2, '0');
+    const day = date.getDate().toString().padStart(2, '0');
+    return `${year}-${month}-${day}`;
+}
+exports.convertMillisToDate = convertMillisToDate;
+function getTimestampsForTodayAndYesterday() {
+    const now = new Date();
+    // Today's Start (00:00:00)
+    const todayStart = new Date(now);
+    todayStart.setHours(0, 0, 0, 0);
+    const todayStartTimestamp = todayStart.getTime();
+    // Today's End (23:59:59.999)
+    const todayEnd = new Date(now);
+    todayEnd.setHours(23, 59, 59, 999);
+    const todayEndTimestamp = todayEnd.getTime();
+    // Yesterday's Start (00:00:00)
+    const yesterdayStart = new Date(now);
+    yesterdayStart.setDate(now.getDate() - 1);
+    yesterdayStart.setHours(0, 0, 0, 0);
+    const yesterdayStartTimestamp = yesterdayStart.getTime();
+    // Yesterday's End (23:59:59.999)
+    const yesterdayEnd = new Date(now);
+    yesterdayEnd.setDate(now.getDate() - 1);
+    yesterdayEnd.setHours(23, 59, 59, 999);
+    const yesterdayEndTimestamp = yesterdayEnd.getTime();
+    return {
+        today: {
+            start: todayStartTimestamp,
+            end: todayEndTimestamp,
+        },
+        yesterday: {
+            start: yesterdayStartTimestamp,
+            end: yesterdayEndTimestamp,
+        },
+    };
+}
+exports.getTimestampsForTodayAndYesterday = getTimestampsForTodayAndYesterday;

package/lib/utils/keitaro-utils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOWCampaign = exports.createFlashCampaigns = exports.createOWStreamPartialPayload = exports.prepareOWCampaignParameters = exports.createOrFindFlashRedirectCampaign = exports.removeGeosFromAllRedirectCampaigns = exports.addGeosToAllRedirectCampaigns = exports.TRAFFIC_SOURCE_ID_FLASH_AI = void 0;
 const keitaro_service_1 = require("../network/keitaro/keitaro-service");
 const sleep_promise_1 = __importDefault(require("sleep-promise"));
+const general_1 = require("../utils/general");
 const FLASH_REDIRECT_GROUP_ID = 82;
 exports.TRAFFIC_SOURCE_ID_FLASH_AI = 22;
 const UNIQUENESS_METHOD = "ip_ua";
@@ -358,12 +359,12 @@ let changeSourceForFA = async () => {
         });
     }
 };
-let replaceDomainInOffers = async (oldDomain, newDomain, offerNameRegEx) => {
+let replaceInOfferLink = async (old, replace, offerNameRegEx) => {
     let offers = await keitaro_service_1.KeitaroService.getAllOffers();
     offers = offers.filter((o) => offerNameRegEx.exec(o.name));
     for (let offer of offers) {
         console.log(offer.name);
-        offer.action_payload = offer.action_payload.replace(oldDomain, newDomain);
+        offer.action_payload = offer.action_payload.replace(old, replace);
         await (0, sleep_promise_1.default)(700);
         await keitaro_service_1.KeitaroService.updateOffer(offer);
     }
@@ -488,4 +489,15 @@ let moveCampaignsToAnotherGroup = async () => {
 // addGeosToAllRedirectCam`paigns("GR")
 // removeGeosFromAllRedirectCampaigns("BE`")
 // gatherInfoForFlashApps()
-// replaceDomainInOffers(`xmariorel.com`, `veemienasorullf.com`, /Icecasino Huffson.*/g)
+// replaceInOfferLink(`xmariorel.com`, `lalielynaualish.com`, /.*icecasino_huffson.*/g)
+// replaceInOfferLink(`lp=18`, `lp=00`, /.*icecasino_huffson.*/g)
+(async () => {
+    try {
+        let timestamps = (0, general_1.getTimestampsForTodayAndYesterday)();
+        let response = await keitaro_service_1.KeitaroService.getProfitForTimeRange(timestamps.today.start, timestamps.today.end);
+        console.log(response);
+    }
+    catch (e) {
+        console.log(e);
+    }
+})();

package/package.json

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

package/src/flash/flash-app.ts

@@ -184,11 +184,11 @@ export const FlashAppSchema = new Schema({
 
     onesignalAppId: {
         type: String,
-        required: true
+        required: false
     },
     onesignalRestApiKey: {
         type: String,
-        required: true
+        required: false
     },
 
     linkPath: {
@@ -197,7 +197,7 @@ export const FlashAppSchema = new Schema({
 
     integrationVersion: {
         type: String,
-        default: IntegrationVersion.MVVM,
+        default: IntegrationVersion.OFFER_STUB,
         enum: IntegrationVersion
     },
     integrationAlterations: Object,

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

@@ -5,6 +5,7 @@ import { IKeitaroCampaign } from "../../keitaro/keitaro-campaign";
 import { IKeitaroDomain } from "../../keitaro/keitaro-domain";
 import { IFlashApp } from "../../flash/flash-app";
 import { TRAFFIC_SOURCE_ID_FLASH_AI, prepareOWCampaignParameters } from "../../utils/keitaro-utils";
+import { convertMillisToDate, getTimestampsForTodayAndYesterday } from "../../utils/general";
 
 async function getStreamsByCampaignId(campaignId: number): Promise<IKeitaroStream[]> {
     const { data: streams } = await keitaroApi.get<IKeitaroStream[]>(`campaigns/${campaignId}/streams`);
@@ -130,7 +131,7 @@ function createStreamPartialPayload(keitaroOfferId: number, offerName: string, o
     }
 }
 
-async function addOfferToKeitaro(offer: IOffer, affiliateId: number, link: string,campaignGroupId?: number, groupId?: number) {
+async function addOfferToKeitaro(offer: IOffer, affiliateId: number, link: string, campaignGroupId?: 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) })
@@ -238,7 +239,34 @@ async function getDomains(onlyActive?: boolean): Promise<IKeitaroDomain[]> {
     return onlyActive ? domains.filter((d) => d.network_status == "active") : domains
 }
 
+async function getProfitForTimeRange(from: number, to: number): Promise<number> {
+    let fromString = convertMillisToDate(from)
+    let toString = convertMillisToDate(to)
+
+    let { data: data } = await keitaroApi.post(`/report/build`, {
+        range: {
+            from: fromString,
+            to: toString,
+            timezone: 'Europe/Madrid'
+        },
+        metrics: ['profit']
+    })
+
+    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 yeterday = await KeitaroService.getProfitForTimeRange(timestamps.yesterday.start, timestamps.yesterday.end)
+
+    return {
+        today: today,
+        yesterday: yeterday
+    }
+}
+
 export const KeitaroService = {
     getStreamsByCampaignId, updateCampaign, getAllCampaigns, getAllOffers, cloneStreams, addOfferToKeitaro, getOfferByKeitaroId, getDomains, createCampaign, getCampaignById, upsertStreamToCampaign, cloneOWCampaign,
-    updateOffer, changeCampaignsGroup
+    updateOffer, changeCampaignsGroup, getProfitForTimeRange, getProfitForTodayAndYesterday
 }

package/src/panel/flash/upsert-flash-app-request.ts

@@ -3,18 +3,18 @@ import { PlugType } from "index"
 
 export interface IUpsertFlashAppRequest {
     id: number
-    name: string
-    bundle: string
+    name?: string
+    bundle?: string
     sourceUrl?: string,
-    enabled: boolean,
-    geos: string,
+    enabled?: boolean,
+    geos?: string,
 
     // onesignalAppId: string
     // onesignalRestApiKey: string
     
     policyUrl?: string,
     
-    integrationVersion: IntegrationVersion,
+    integrationVersion?: IntegrationVersion,
     
     webInterfaceName?: string,
     generationOptions?: Partial<IAppGenerationOptions>

package/src/utils/general.ts

@@ -0,0 +1,44 @@
+export function convertMillisToDate(millis: number): string {
+    const date = new Date(millis);
+    const year = date.getFullYear();
+    const month = (date.getMonth() + 1).toString().padStart(2, '0');
+    const day = date.getDate().toString().padStart(2, '0');
+    return `${year}-${month}-${day}`;
+}
+
+export function getTimestampsForTodayAndYesterday() {
+    const now = new Date();
+
+    // Today's Start (00:00:00)
+    const todayStart = new Date(now);
+    todayStart.setHours(0, 0, 0, 0);
+    const todayStartTimestamp = todayStart.getTime();
+
+    // Today's End (23:59:59.999)
+    const todayEnd = new Date(now);
+    todayEnd.setHours(23, 59, 59, 999);
+    const todayEndTimestamp = todayEnd.getTime();
+
+    // Yesterday's Start (00:00:00)
+    const yesterdayStart = new Date(now);
+    yesterdayStart.setDate(now.getDate() - 1);
+    yesterdayStart.setHours(0, 0, 0, 0);
+    const yesterdayStartTimestamp = yesterdayStart.getTime();
+
+    // Yesterday's End (23:59:59.999)
+    const yesterdayEnd = new Date(now);
+    yesterdayEnd.setDate(now.getDate() - 1);
+    yesterdayEnd.setHours(23, 59, 59, 999);
+    const yesterdayEndTimestamp = yesterdayEnd.getTime();
+
+    return {
+        today: {
+            start: todayStartTimestamp,
+            end: todayEndTimestamp,
+        },
+        yesterday: {
+            start: yesterdayStartTimestamp,
+            end: yesterdayEndTimestamp,
+        },
+    };
+}

package/src/utils/keitaro-utils.ts

@@ -1,13 +1,13 @@
 import { IKeitaroStream } from "../keitaro/keitaro-stream"
-import {  IFlashApp, PlugType, } from "../flash/flash-app"
+import { IFlashApp, PlugType, } from "../flash/flash-app"
 import { FlashAppType } from "../flash/flash-app-type"
 import { IKeitaroCampaign, IKeitaroCampaignParameters } from "../keitaro/keitaro-campaign"
 import { IKeitaroDomain } from "../keitaro/keitaro-domain"
 import { KeitaroService } from "../network/keitaro/keitaro-service"
 import sleep from 'sleep-promise';
 import * as util from 'util';
-import { PasteMap, TrackingMap } from "utils/app-gathering-utils"
 import axios from "axios"
+import { getTimestampsForTodayAndYesterday } from "../utils/general"
 
 const FLASH_REDIRECT_GROUP_ID = 82
 export const TRAFFIC_SOURCE_ID_FLASH_AI = 22
@@ -394,14 +394,14 @@ let changeSourceForFA = async () => {
     }
 }
 
-let replaceDomainInOffers = async (oldDomain: string, newDomain: string, offerNameRegEx: RegExp)=> {
+let replaceInOfferLink = async (old: string, replace: string, offerNameRegEx: RegExp) => {
     let offers = await KeitaroService.getAllOffers()
 
     offers = offers.filter((o) => offerNameRegEx.exec(o.name))
 
     for (let offer of offers) {
         console.log(offer.name)
-        offer.action_payload = offer.action_payload.replace(oldDomain, newDomain)
+        offer.action_payload = offer.action_payload.replace(old, replace)
 
         await sleep(700)
         await KeitaroService.updateOffer(offer)
@@ -530,14 +530,14 @@ let findBrokenOfferStreams = async () => {
                 console.log(`${stream.name}: id payload is missing, payload: ${stream.filters}`)
             }
         }
-    } 
+    }
 }
 
 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()
 
@@ -561,5 +561,15 @@ let moveCampaignsToAnotherGroup = async () => {
 
 // gatherInfoForFlashApps()
 
-// replaceDomainInOffers(`xmariorel.com`, `veemienasorullf.com`, /Icecasino Huffson.*/g)
+// replaceInOfferLink(`xmariorel.com`, `lalielynaualish.com`, /.*icecasino_huffson.*/g)
+// replaceInOfferLink(`lp=18`, `lp=00`, /.*icecasino_huffson.*/g)
 
+(async () => {
+    try {
+        let timestamps = getTimestampsForTodayAndYesterday()
+        let response = await KeitaroService.getProfitForTimeRange(timestamps.today.start, timestamps.today.end)
+        console.log(response)
+    } catch (e) {
+        console.log(e)
+    }
+})()