@bprotsyk/aso-core 2.1.132 → 2.1.140

package/lib/app/app.d.ts

@@ -33,6 +33,7 @@ export interface IApp extends Document {
     proxied: boolean;
     ech?: boolean;
     imageFormat: EImageFormat;
+    policyPath: string;
 }
 export declare enum EImageFormat {
     PNG = "png",
@@ -197,18 +198,19 @@ export declare enum PlugType {
 }
 export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, {
     id: number;
-    type: string;
+    type: AppType;
     geo: string[];
     enabled: boolean;
     proxied: boolean;
     ech: boolean;
-    imageFormat: string;
-    status: string;
-    team: string;
+    imageFormat: EImageFormat;
+    status: AppStatus;
+    team: ETeam;
     bundle: string;
     trackingUrl: string;
-    integrationVersion: string;
+    integrationVersion: IntegrationVersion;
     removeInfo: any;
+    policyPath: string;
     name?: string | null | undefined;
     pushesEnabled?: boolean | null | undefined;
     publicationHistory?: any;
@@ -240,18 +242,19 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
     } | null | undefined;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     id: number;
-    type: string;
+    type: AppType;
     geo: string[];
     enabled: boolean;
     proxied: boolean;
     ech: boolean;
-    imageFormat: string;
-    status: string;
-    team: string;
+    imageFormat: EImageFormat;
+    status: AppStatus;
+    team: ETeam;
     bundle: string;
     trackingUrl: string;
-    integrationVersion: string;
+    integrationVersion: IntegrationVersion;
     removeInfo: any;
+    policyPath: string;
     name?: string | null | undefined;
     pushesEnabled?: boolean | null | undefined;
     publicationHistory?: any;
@@ -281,20 +284,21 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
         name?: string | null | undefined;
         clouflareZone?: string | null | undefined;
     } | null | undefined;
-}>> & mongoose.FlatRecord<{
+}>, {}, mongoose.ResolveSchemaOptions<mongoose.DefaultSchemaOptions>> & mongoose.FlatRecord<{
     id: number;
-    type: string;
+    type: AppType;
     geo: string[];
     enabled: boolean;
     proxied: boolean;
     ech: boolean;
-    imageFormat: string;
-    status: string;
-    team: string;
+    imageFormat: EImageFormat;
+    status: AppStatus;
+    team: ETeam;
     bundle: string;
     trackingUrl: string;
-    integrationVersion: string;
+    integrationVersion: IntegrationVersion;
     removeInfo: any;
+    policyPath: string;
     name?: string | null | undefined;
     pushesEnabled?: boolean | null | undefined;
     publicationHistory?: any;

package/lib/app/app.js

@@ -211,5 +211,9 @@ exports.AppSchema = new mongoose_1.Schema({
             type: String,
         },
     },
-    platforms: Object
+    platforms: Object,
+    policyPath: {
+        type: String,
+        default: "none"
+    }
 });

package/lib/general/domain.d.ts

@@ -15,12 +15,12 @@
 /// <reference types="mongoose/types/populate" />
 /// <reference types="mongoose/types/query" />
 /// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/session" />
 /// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/inferschematype" />
 /// <reference types="mongoose/types/inferrawdoctype" />
 import { ICloudflareDomainType } from "general/cloudflare-domain";
@@ -53,6 +53,7 @@ export interface IDomain extends Document {
     note: string;
     proxied: boolean;
     appid: number;
+    expirationMessageSent?: boolean;
 }
 export interface IDomainsBuyRequestResponse {
     requestId: string;
@@ -86,6 +87,7 @@ export declare const DomainSchema: Schema<any, Model<any, any, any, any, any, an
     originalNameServers: string[];
     txtRecords: string[];
     assignedTo: number[];
+    expirationMessageSent: boolean;
     id?: string | null | undefined;
     name?: string | null | undefined;
     type?: string | null | undefined;
@@ -113,6 +115,7 @@ export declare const DomainSchema: Schema<any, Model<any, any, any, any, any, an
     originalNameServers: string[];
     txtRecords: string[];
     assignedTo: number[];
+    expirationMessageSent: boolean;
     id?: string | null | undefined;
     name?: string | null | undefined;
     type?: string | null | undefined;
@@ -135,11 +138,12 @@ export declare const DomainSchema: Schema<any, Model<any, any, any, any, any, an
     archived?: boolean | null | undefined;
     note?: string | null | undefined;
     appid?: number | null | undefined;
-}>> & import("mongoose").FlatRecord<{
+}>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<{
     nameServers: string[];
     originalNameServers: string[];
     txtRecords: string[];
     assignedTo: number[];
+    expirationMessageSent: boolean;
     id?: string | null | undefined;
     name?: string | null | undefined;
     type?: string | null | undefined;

package/lib/general/domain.js

@@ -58,5 +58,6 @@ exports.DomainSchema = new mongoose_1.Schema({
     title: String,
     note: String,
     proxied: Boolean,
-    appid: Number
+    appid: Number,
+    expirationMessageSent: { type: Boolean, default: false }
 });

package/lib/general/namecheap-domain.d.ts

@@ -15,12 +15,12 @@
 /// <reference types="mongoose/types/populate" />
 /// <reference types="mongoose/types/query" />
 /// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/session" />
 /// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/inferschematype" />
 /// <reference types="mongoose/types/inferrawdoctype" />
 import { Schema, Document } from "mongoose";
@@ -79,7 +79,7 @@ export declare const NamecheapBuyRequestSchema: Schema<any, import("mongoose").M
         name?: string | null | undefined;
         price?: number | null | undefined;
         available?: boolean | null | undefined;
-    }, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, any, {
+    }, import("mongoose").Types.Subdocument<import("bson").ObjectId, any, {
         name?: string | null | undefined;
         price?: number | null | undefined;
         available?: boolean | null | undefined;
@@ -96,7 +96,7 @@ export declare const NamecheapBuyRequestSchema: Schema<any, import("mongoose").M
         name?: string | null | undefined;
         price?: number | null | undefined;
         available?: boolean | null | undefined;
-    }, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, any, {
+    }, import("mongoose").Types.Subdocument<import("bson").ObjectId, any, {
         name?: string | null | undefined;
         price?: number | null | undefined;
         available?: boolean | null | undefined;
@@ -108,12 +108,12 @@ export declare const NamecheapBuyRequestSchema: Schema<any, import("mongoose").M
     id?: string | null | undefined;
     ip?: string | null | undefined;
     fullfilled?: boolean | null | undefined;
-}>> & import("mongoose").FlatRecord<{
+}>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<{
     domains: import("mongoose").Types.DocumentArray<{
         name?: string | null | undefined;
         price?: number | null | undefined;
         available?: boolean | null | undefined;
-    }, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, any, {
+    }, import("mongoose").Types.Subdocument<import("bson").ObjectId, any, {
         name?: string | null | undefined;
         price?: number | null | undefined;
         available?: boolean | null | undefined;

package/lib/keitaro/keitaro-conversions.d.ts

@@ -0,0 +1,52 @@
+import { KeitaroClicksInterval } from './keitaro-clicks';
+export declare enum KeitaroOperator {
+    EQUALS = "EQUALS",
+    NOT_EQUAL = "NOT_EQUAL",
+    EQUALS_OR_GREATER_THAN = "EQUALS_OR_GREATER_THAN",
+    EQUALS_OR_LESS_THAN = "EQUALS_OR_LESS_THAN",
+    GREATER_THAN = "GREATER_THAN",
+    LESS_THAN = "LESS_THAN",
+    MATCH_REGEXP = "MATCH_REGEXP",
+    NOT_MATCH_REGEXP = "NOT_MATCH_REGEXP",
+    BEGINS_WITH = "BEGINS_WITH",
+    ENDS_WITH = "ENDS_WITH",
+    CONTAINS = "CONTAINS",
+    NOT_CONTAIN = "NOT_CONTAIN",
+    IN_LIST = "IN_LIST",
+    NOT_IN_LIST = "NOT_IN_LIST",
+    BETWEEN = "BETWEEN",
+    IS_SET = "IS_SET",
+    IS_NOT_SET = "IS_NOT_SET",
+    IS_TRUE = "IS_TRUE",
+    IS_FALSE = "IS_FALSE",
+    HAS_LABEL = "HAS_LABEL",
+    NOT_HAS_LABEL = "NOT_HAS_LABEL"
+}
+export interface IKeitaroConversionRangeRequest {
+    from?: string;
+    to?: string;
+    timezone?: string;
+    interval?: KeitaroClicksInterval;
+}
+export interface IKeitaroConversionFilterRequest {
+    name: string;
+    operator: KeitaroOperator;
+    expression?: string | number | Array<string | number>;
+}
+export interface IKeitaroConversionSortRequest {
+    name: string;
+    order: 'ASC' | 'DESC';
+}
+export interface IKeitaroConversionsRequest {
+    range: IKeitaroConversionRangeRequest;
+    limit?: number;
+    offset?: number;
+    columns?: string[];
+    filters?: IKeitaroConversionFilterRequest[];
+    sort?: IKeitaroConversionSortRequest[];
+}
+export interface IKeitaroConversionsResponse {
+    rows: any[];
+    total: number;
+    meta: string[];
+}

package/lib/keitaro/keitaro-conversions.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeitaroOperator = void 0;
+var KeitaroOperator;
+(function (KeitaroOperator) {
+    KeitaroOperator["EQUALS"] = "EQUALS";
+    KeitaroOperator["NOT_EQUAL"] = "NOT_EQUAL";
+    KeitaroOperator["EQUALS_OR_GREATER_THAN"] = "EQUALS_OR_GREATER_THAN";
+    KeitaroOperator["EQUALS_OR_LESS_THAN"] = "EQUALS_OR_LESS_THAN";
+    KeitaroOperator["GREATER_THAN"] = "GREATER_THAN";
+    KeitaroOperator["LESS_THAN"] = "LESS_THAN";
+    KeitaroOperator["MATCH_REGEXP"] = "MATCH_REGEXP";
+    KeitaroOperator["NOT_MATCH_REGEXP"] = "NOT_MATCH_REGEXP";
+    KeitaroOperator["BEGINS_WITH"] = "BEGINS_WITH";
+    KeitaroOperator["ENDS_WITH"] = "ENDS_WITH";
+    KeitaroOperator["CONTAINS"] = "CONTAINS";
+    KeitaroOperator["NOT_CONTAIN"] = "NOT_CONTAIN";
+    KeitaroOperator["IN_LIST"] = "IN_LIST";
+    KeitaroOperator["NOT_IN_LIST"] = "NOT_IN_LIST";
+    KeitaroOperator["BETWEEN"] = "BETWEEN";
+    KeitaroOperator["IS_SET"] = "IS_SET";
+    KeitaroOperator["IS_NOT_SET"] = "IS_NOT_SET";
+    KeitaroOperator["IS_TRUE"] = "IS_TRUE";
+    KeitaroOperator["IS_FALSE"] = "IS_FALSE";
+    KeitaroOperator["HAS_LABEL"] = "HAS_LABEL";
+    KeitaroOperator["NOT_HAS_LABEL"] = "NOT_HAS_LABEL";
+})(KeitaroOperator = exports.KeitaroOperator || (exports.KeitaroOperator = {}));

package/lib/keitaro/keitaro-utils.d.ts

@@ -0,0 +1,2 @@
+import { ConversionComparison } from '../utils/comparing';
+export declare function displayComparisonResults(comparison: ConversionComparison): void;

package/lib/keitaro/keitaro-utils.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.displayComparisonResults = void 0;
+function displayComparisonResults(comparison) {
+    const isValidStatus = (status) => ['sale', 'rebill'].includes(status);
+    let wpTotalSum = comparison.wpConversions
+        .reduce((sum, conv) => sum + conv.sum, 0);
+    let keitaroTotalSum = comparison.keitaroConversions
+        .filter(conv => isValidStatus(conv.status))
+        .reduce((sum, conv) => sum + (parseFloat(conv.revenue) || 0), 0);
+    // Get all Keitaro rejected conversions
+    const allKeitaroRejected = [
+        ...comparison.rejected.keitaro,
+        ...comparison.matches
+            .filter(match => match.keitaro.status === 'rejected')
+            .map(match => match.keitaro)
+    ];
+    // Group mismatches by project/offer
+    const wpMismatchesByProject = new Map();
+    const keitaroMismatchesByOffer = new Map();
+    const rejectedByOffer = new Map();
+    comparison.mismatches.onlyInWP.forEach(conv => {
+        if (!wpMismatchesByProject.has(conv.project)) {
+            wpMismatchesByProject.set(conv.project, { count: 0, sum: 0, conversions: [] });
+        }
+        const projectStats = wpMismatchesByProject.get(conv.project);
+        projectStats.count++;
+        projectStats.sum += conv.sum;
+        projectStats.conversions.push(conv);
+    });
+    // Include all conversions in mismatches, including rejected ones
+    [...comparison.mismatches.onlyInKeitaro, ...allKeitaroRejected].forEach(conv => {
+        if (!keitaroMismatchesByOffer.has(conv.offer)) {
+            keitaroMismatchesByOffer.set(conv.offer, { count: 0, sum: 0, conversions: [] });
+        }
+        const offerStats = keitaroMismatchesByOffer.get(conv.offer);
+        offerStats.count++;
+        offerStats.sum += parseFloat(conv.revenue) || 0;
+        offerStats.conversions.push(conv);
+    });
+    // Group rejected conversions by offer
+    allKeitaroRejected.forEach(conv => {
+        if (!rejectedByOffer.has(conv.offer)) {
+            rejectedByOffer.set(conv.offer, { count: 0, sum: 0, conversions: [] });
+        }
+        const offerStats = rejectedByOffer.get(conv.offer);
+        offerStats.count++;
+        offerStats.sum += parseFloat(conv.revenue) || 0;
+        offerStats.conversions.push(conv);
+    });
+    console.log('\n\x1b[1mЗагальна статистика:\x1b[0m');
+    console.log(`Всього конверсій у WP: ${comparison.wpConversions.length} (Сума: \x1b[33m$${wpTotalSum.toFixed(2)}\x1b[0m)`);
+    console.log(`Всього конверсій у Keitaro: ${comparison.keitaroConversions.filter(conv => isValidStatus(conv.status)).length} (Сума: \x1b[33m$${keitaroTotalSum.toFixed(2)}\x1b[0m)`);
+    console.log(`Співпадінь: ${comparison.matches.length}`);
+    console.log(`Відхилених конверсій: ${allKeitaroRejected.length}`);
+    const totalDiff = Math.abs(wpTotalSum - keitaroTotalSum);
+    console.log(`\x1b[1mЗагальна різниця:\x1b[0m \x1b[33m$${totalDiff.toFixed(2)}\x1b[0m`);
+    // Always show rejected conversions first if there are any
+    if (allKeitaroRejected.length > 0) {
+        const rejectedTotal = allKeitaroRejected.reduce((sum, conv) => sum + (parseFloat(conv.revenue) || 0), 0);
+        console.log('\n\x1b[1mВідхилені конверсії в Keitaro за офферами:\x1b[0m');
+        console.log(`Загальна кількість: ${allKeitaroRejected.length}`);
+        console.log(`Загальна сума: \x1b[33m$${rejectedTotal.toFixed(2)}\x1b[0m`);
+        for (const [offer, stats] of rejectedByOffer.entries()) {
+            console.log(`\n\x1b[33m${offer}:\x1b[0m`);
+            console.log(`Кількість: ${stats.count}, Сума: $${stats.sum.toFixed(2)}`);
+            stats.conversions.forEach(conv => {
+                const matchMark = comparison.matches.some(match => match.keitaro.sub_id === conv.sub_id) ? '[matched] ' : '';
+                console.log(`  ${matchMark}${conv.sub_id} | ${conv.sale_datetime.split(' ')[0]} | $${conv.revenue}`);
+            });
+        }
+    }
+    console.log('\n\x1b[1mВідсутні в Keitaro за проектами:\x1b[0m');
+    for (const [project, stats] of wpMismatchesByProject) {
+        console.log(`\n\x1b[31m${project}:\x1b[0m`);
+        console.log(`Кількість: ${stats.count}, Сума: $${stats.sum.toFixed(2)}`);
+        stats.conversions.forEach(conv => {
+            console.log(`  ${conv.clickId} | ${conv.regDate.toISOString().split('T')[0]} | $${conv.sum}`);
+        });
+    }
+    console.log('\n\x1b[1mВідсутні в WP за офферами:\x1b[0m');
+    for (const [offer, stats] of keitaroMismatchesByOffer) {
+        console.log(`\n\x1b[32m${offer}:\x1b[0m`);
+        console.log(`Кількість: ${stats.count}, Сума: $${stats.sum.toFixed(2)}`);
+        stats.conversions.forEach(conv => {
+            const statusMark = conv.status === 'rejected' ? '(rejected) ' : '';
+            const matchMark = comparison.matches.some(match => match.keitaro.sub_id === conv.sub_id) ? '[matched] ' : '';
+            console.log(`  ${statusMark}${matchMark}${conv.sub_id} | ${conv.sale_datetime.split(' ')[0]} | $${conv.revenue}`);
+        });
+    }
+    let mismatchWPSum = comparison.mismatches.onlyInWP
+        .reduce((sum, conv) => sum + conv.sum, 0);
+    let mismatchKeitaroSum = [...comparison.mismatches.onlyInKeitaro, ...allKeitaroRejected]
+        .reduce((sum, conv) => sum + (parseFloat(conv.revenue) || 0), 0);
+    console.log('\n\x1b[1mПідсумок розбіжностей:\x1b[0m');
+    console.log(`Сума відсутніх в Keitaro: \x1b[31m$${mismatchWPSum.toFixed(2)}\x1b[0m`);
+    console.log(`Сума відсутніх в WP: \x1b[32m$${mismatchKeitaroSum.toFixed(2)}\x1b[0m`);
+    console.log(`Різниця у відсутніх конверсіях: \x1b[33m$${Math.abs(mismatchWPSum - mismatchKeitaroSum).toFixed(2)}\x1b[0m`);
+    // Debug information
+    const matchingRejected = comparison.matches.filter(match => match.keitaro.status === 'rejected').length;
+    console.log('\n\x1b[1mДебаг інформація:\x1b[0m');
+    console.log(`Кількість конверсій відсутніх в WP: ${comparison.mismatches.onlyInKeitaro.length + comparison.rejected.keitaro.length + matchingRejected}`);
+    console.log(`З них:`);
+    console.log(`- Активних: ${comparison.mismatches.onlyInKeitaro.length}`);
+    console.log(`- Відхилених (унікальних): ${comparison.rejected.keitaro.length}`);
+    console.log(`- Відхилених (що є в WP): ${matchingRejected}`);
+}
+exports.displayComparisonResults = displayComparisonResults;

package/lib/keitaro-utils.d.ts

@@ -0,0 +1,2 @@
+import { ConversionComparison } from './utils/comparing';
+export declare function displayComparisonResults(comparison: ConversionComparison): void;

package/lib/keitaro-utils.js

@@ -0,0 +1,136 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.displayComparisonResults = void 0;
+const keitaro_service_1 = require("./network/keitaro/keitaro-service");
+const keitaro_conversions_1 = require("./keitaro/keitaro-conversions");
+const path = __importStar(require("path"));
+const comparing_1 = require("./utils/comparing");
+function displayComparisonResults(comparison) {
+    const isValidStatus = (status) => ['sale', 'rebill'].includes(status);
+    // Считаем общие суммы
+    let wpTotalSum = comparison.wpConversions
+        .reduce((sum, conv) => sum + conv.sum, 0);
+    let keitaroTotalSum = comparison.keitaroConversions
+        .filter((conv) => isValidStatus(conv.status))
+        .reduce((sum, conv) => sum + (parseFloat(conv.revenue) || 0), 0);
+    // Находим разницу
+    const totalDiff = keitaroTotalSum - wpTotalSum;
+    console.log('\n\x1b[1mЗагальна статистика:\x1b[0m');
+    console.log(`WP сума: $${wpTotalSum.toFixed(2)}`);
+    console.log(`Keitaro сума: $${keitaroTotalSum.toFixed(2)}`);
+    console.log(`Різниця: $${totalDiff.toFixed(2)}`);
+    // Получаем конверсии, которые есть в Keitaro, но нет в WP
+    const extraKeitaroConversions = comparison.mismatches.onlyInKeitaro
+        .filter(conv => isValidStatus(conv.status))
+        .sort((a, b) => (parseFloat(b.revenue) || 0) - (parseFloat(a.revenue) || 0));
+    // Группируем по офферам для удобства
+    const byOffer = new Map();
+    extraKeitaroConversions.forEach(conv => {
+        const offer = conv.offer || 'Unknown Offer';
+        if (!byOffer.has(offer)) {
+            byOffer.set(offer, { count: 0, sum: 0, conversions: [] });
+        }
+        const stats = byOffer.get(offer);
+        const revenue = parseFloat(conv.revenue) || 0;
+        stats.count++;
+        stats.sum += revenue;
+        stats.conversions.push(conv);
+    });
+    console.log('\n\x1b[1mКонверсії, які є в Keitaro, але відсутні в WP:\x1b[0m');
+    let totalExtraSum = 0;
+    for (const [offer, stats] of byOffer) {
+        console.log(`\n\x1b[33m${offer}:\x1b[0m`);
+        console.log(`Кількість: ${stats.count}, Сума: $${stats.sum.toFixed(2)}`);
+        stats.conversions.forEach(conv => {
+            if (conv.sub_id && conv.revenue) {
+                console.log(`  ${conv.sub_id} | ${conv.revenue}`);
+                totalExtraSum += parseFloat(conv.revenue) || 0;
+            }
+        });
+    }
+    console.log('\n\x1b[1mПідсумок:\x1b[0m');
+    console.log(`Загальна сума "зайвих" конверсій: \x1b[33m$${totalExtraSum.toFixed(2)}\x1b[0m`);
+    console.log('Це конверсії, які потрібно видалити з Keitaro, щоб суми співпадали з WP');
+}
+exports.displayComparisonResults = displayComparisonResults;
+// Self-executing function to fetch and compare conversions
+(async () => {
+    const request = {
+        range: {
+            from: '2025-01-01',
+            to: '2025-01-31',
+            timezone: 'Europe/Kyiv'
+        },
+        filters: [
+            {
+                name: 'status',
+                operator: keitaro_conversions_1.KeitaroOperator.IN_LIST,
+                expression: ['sale', 'rejected']
+            },
+            {
+                name: 'affiliate_network_id',
+                operator: keitaro_conversions_1.KeitaroOperator.EQUALS,
+                expression: 2
+            }
+        ],
+        columns: [
+            'sign', 'version', 'campaign', 'campaign_group', 'landing_group', 'offer_group',
+            'landing', 'offer', 'affiliate_network', 'ts', 'stream', 'source',
+            'x_requested_with', 'referrer', 'search_engine', 'keyword', 'click_id',
+            'sub_id', 'visitor_code', 'campaign_id', 'campaign_group_id', 'offer_group_id',
+            'landing_group_id', 'landing_id', 'offer_id', 'affiliate_network_id', 'ts_id',
+            'stream_id', 'ad_campaign_id', 'external_id', 'creative_id',
+            'sub_id_1', 'sub_id_2', 'sub_id_3', 'sub_id_4', 'sub_id_5',
+            'sub_id_6', 'sub_id_7', 'sub_id_8', 'sub_id_9', 'sub_id_10',
+            'sub_id_11', 'sub_id_12', 'sub_id_13', 'sub_id_14', 'sub_id_15',
+            'sub_id_16', 'sub_id_17', 'sub_id_18', 'sub_id_19', 'sub_id_20',
+            'sub_id_21', 'sub_id_22', 'sub_id_23', 'sub_id_24', 'sub_id_25',
+            'sub_id_26', 'sub_id_27', 'sub_id_28', 'sub_id_29', 'sub_id_30',
+            'connection_type', 'operator', 'isp', 'country_code', 'country_flag',
+            'country', 'region', 'region_code', 'city', 'language', 'device_type',
+            'user_agent', 'os_icon', 'os', 'os_version', 'browser', 'browser_version',
+            'device_model', 'browser_icon', 'ip', 'ip_mask1', 'ip_mask2', 'ipv4only',
+            'ipv6only', 'cost', 'postback_datetime', 'sale_datetime', 'click_datetime',
+            'sale_period', 'status', 'previous_status', 'original_status',
+            'previous_conversion_id', 'params', 'conversion_id', 'tid',
+            'profitability', 'revenue', 'profit'
+        ],
+        sort: [{
+                name: 'sale_datetime',
+                order: 'DESC'
+            }]
+    };
+    try {
+        const conversions = await keitaro_service_1.KeitaroService.getConversions(request);
+        const wpFilePath = path.join(process.cwd(), 'src', 'utils', 'wp-january.csv');
+        const comparison = await (0, comparing_1.compareConversions)(wpFilePath, conversions);
+        // Use our improved display function
+        displayComparisonResults(comparison);
+    }
+    catch (error) {
+        console.error('Error fetching conversions:', error);
+    }
+})();

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

@@ -151,7 +151,7 @@ async function addOffersToTraffleKeitaro(offers) {
         let name = `${offer.offer.caption} ${offer.offer.geo} [el trafico] ${offer.trafficType}`;
         const identicalOffer = allOffers.find(o => o.name.includes(name));
         let offersGroupId = findMatchingOffersGroup(offersGroups, offer);
-        let affiliateId = await findMatchingAffiliateId(affiliateNetworks, offer);
+        let affiliateId = 160; // await findMatchingAffiliateId(affiliateNetworks, offer)
         if (!identicalOffer) {
             const offerPayload = {
                 name: name,
@@ -467,8 +467,7 @@ async function updateAppWithCampaignParams(existingCampaign, app, platform) {
 async function cloneTraffleCampaign(app, platform, addDefaultStreams) {
     const ORIGINAL_CLONE_CAMPAIGN_ID = 1925;
     const appsflyerAvailability = app.platforms[platform].appsflyerParams?.apiToken ? "[AF]" : "";
-    // traffle template [app_id] [app_bundle] app_name [app_lead_developer] domain
-    let name = `[${app.id}] [${app.bundle}] ET [${app.name}] [Volodymyr Vinnik]  [Android] ${appsflyerAvailability} ${app.domainParams.name}`;
+    let name = `[${app.id}] [${app.bundle}] ${app.name} [Volodymyr Vinnik] [El Trafico] [Android] ${appsflyerAvailability} ${app.domainParams.name}`;
     let platformName = platform ? (0, app_1.getPlatformName)(platform) : null;
     const platformCampaignName = `#${app.id} [➥] (${platformName})`;
     const generateAlias = () => {

package/lib/offers/list.d.ts

@@ -15,12 +15,12 @@
 /// <reference types="mongoose/types/populate" />
 /// <reference types="mongoose/types/query" />
 /// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/session" />
 /// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/inferschematype" />
 /// <reference types="mongoose/types/inferrawdoctype" />
 import { Schema } from "mongoose";
@@ -85,7 +85,7 @@ export declare const SectionsListSchema: Schema<any, import("mongoose").Model<an
         getOwnPropertyDescriptors?: {} | null | undefined;
         fromEntries?: {} | null | undefined;
         hasOwn?: {} | null | undefined;
-    }, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, any, {
+    }, import("mongoose").Types.Subdocument<import("bson").ObjectId, any, {
         prototype?: {
             constructor: {
                 name?: unknown;
@@ -218,7 +218,7 @@ export declare const SectionsListSchema: Schema<any, import("mongoose").Model<an
         getOwnPropertyDescriptors?: {} | null | undefined;
         fromEntries?: {} | null | undefined;
         hasOwn?: {} | null | undefined;
-    }, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, any, {
+    }, import("mongoose").Types.Subdocument<import("bson").ObjectId, any, {
         prototype?: {
             constructor: {
                 name?: unknown;
@@ -305,7 +305,7 @@ export declare const SectionsListSchema: Schema<any, import("mongoose").Model<an
         fromEntries?: {} | null | undefined;
         hasOwn?: {} | null | undefined;
     }>;
-}>> & import("mongoose").FlatRecord<{
+}>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<{
     id: number;
     name: string;
     content: import("mongoose").Types.DocumentArray<{
@@ -351,7 +351,7 @@ export declare const SectionsListSchema: Schema<any, import("mongoose").Model<an
         getOwnPropertyDescriptors?: {} | null | undefined;
         fromEntries?: {} | null | undefined;
         hasOwn?: {} | null | undefined;
-    }, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, any, {
+    }, import("mongoose").Types.Subdocument<import("bson").ObjectId, any, {
         prototype?: {
             constructor: {
                 name?: unknown;