@bprotsyk/aso-core 2.1.57 → 2.1.59

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

@@ -202,11 +202,13 @@ async function cloneOWCampaign(app, platform) {
     };
     let allCampaigns = await getAllCampaigns();
     let matchingCampaign = [];
-    if (platform) {
-        matchingCampaign = allCampaigns.filter((c) => c.name === `#${app.id} [◈] (${platformName})`);
+    if (platform && platform !== app_1.EPlatform.GENERAL) {
+        // Шукаємо кампанію з платформою
+        matchingCampaign = allCampaigns.filter((c) => c.name.includes(`#${app.id}`) && c.name.includes(`(${platformName})`));
     }
     else {
-        matchingCampaign = allCampaigns.filter((c) => c.name === `#${app.id} [◈]`);
+        // Шукаємо кампанію без платформи або з суфіксом
+        matchingCampaign = allCampaigns.filter((c) => c.name.includes(`#${app.id}`) && !c.name.includes('('));
     }
     if (matchingCampaign.length > 0)
         return matchingCampaign[0];
@@ -239,7 +241,7 @@ async function cloneOWCampaign(app, platform) {
         cookies_ttl: originalCampaign.cookies_ttl,
         notes: originalCampaign.notes,
         collect_clicks: originalCampaign.collect_clicks,
-        uniqueness_type: originalCampaign.uniqueness_type, // тип унікальності (IP і user-agent)
+        uniqueness_type: originalCampaign.uniqueness_type,
     };
     const newCampaign = await createCampaign(payload);
     for (const stream of originalStreams) {

package/lib/panel/user.d.ts

@@ -33,7 +33,8 @@ export declare enum PanelUserAccessScope {
     OFFERS_RW = 5,
     OFFERWALL_RO = 6,
     OFFERWALL_RW = 7,
-    ASO_LOGS = 8
+    ASO_LOGS = 8,
+    MANAGER = 9
 }
 export interface IPanelUser extends Document {
     username: string;

package/lib/panel/user.js

@@ -13,6 +13,7 @@ var PanelUserAccessScope;
     PanelUserAccessScope[PanelUserAccessScope["OFFERWALL_RO"] = 6] = "OFFERWALL_RO";
     PanelUserAccessScope[PanelUserAccessScope["OFFERWALL_RW"] = 7] = "OFFERWALL_RW";
     PanelUserAccessScope[PanelUserAccessScope["ASO_LOGS"] = 8] = "ASO_LOGS";
+    PanelUserAccessScope[PanelUserAccessScope["MANAGER"] = 9] = "MANAGER";
 })(PanelUserAccessScope = exports.PanelUserAccessScope || (exports.PanelUserAccessScope = {}));
 exports.PanelUserSchema = new mongoose_1.Schema({
     username: {

package/package.json

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

package/src/app/app.ts

@@ -340,4 +340,8 @@ export const AppSchema = new Schema({
         },
     },
     platforms: Object
-})
+})
+
+
+
+

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

@@ -240,7 +240,7 @@ export async function upsertStreamToCampaign(campaign: IKeitaroCampaign, stream:
 async function cloneOWCampaign(app: IApp, platform?: EPlatform): Promise<IKeitaroCampaign | any> {
     let name = `#${app.id} [◈]`
     let platformName = platform ? getPlatformName(platform) : null;
-    const platformCampaignName =  `#${app.id} [◈] (${platformName})`
+    const platformCampaignName = `#${app.id} [◈] (${platformName})`;
     const generateAlias = () => {
         const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
         return Array.from(
@@ -249,46 +249,37 @@ async function cloneOWCampaign(app: IApp, platform?: EPlatform): Promise<IKeitar
         ).join('');
     };
 
-    let allCampaigns = await getAllCampaigns()
+    let allCampaigns = await getAllCampaigns();
 
     let matchingCampaign: IKeitaroCampaign[] = [];
 
-    if (platform) {
+    if (platform && platform !== EPlatform.GENERAL) {
+        // Шукаємо кампанію з платформою
         matchingCampaign = allCampaigns.filter((c) => 
-            c.name === `#${app.id} [◈] (${platformName})`
-        )
+            c.name.includes(`#${app.id}`) && c.name.includes(`(${platformName})`)
+        );
     } else {
+        // Шукаємо кампанію без платформи або з суфіксом
         matchingCampaign = allCampaigns.filter((c) => 
-            c.name === `#${app.id} [◈]`
-        )
+            c.name.includes(`#${app.id}`) && !c.name.includes('(')
+        );
     }
 
+    if (matchingCampaign.length > 0) return matchingCampaign[0];
 
+    const originalCampaign: IKeitaroCampaign = await getCampaignById(2673);
+    const maxPosition = Math.max(...allCampaigns.map(c => c.position || 0));
+    const originalStreams = await getStreamsByCampaignId(2673);
 
-    if (matchingCampaign.length > 0) return matchingCampaign[0]
-
-  const originalCampaign : IKeitaroCampaign = await getCampaignById(2673)
-  const maxPosition = Math.max(...allCampaigns.map(c => c.position || 0));
-  const originalStreams = await getStreamsByCampaignId(2673)
-
-  
-
-    
-
-
-    let allDomains = await KeitaroService.getDomains(true)
+    let allDomains = await KeitaroService.getDomains(true);
     if (!allDomains) {
-        throw Error(`Failed to get all domains list`)
+        throw Error(`Failed to get all domains list`);
     }
 
     const domain = allDomains[Math.floor(Math.random() * allDomains.length)];
     const maxGroupId = Math.max(...allCampaigns.map(c => c.group_id || 0));
 
-
-    let alias = generateAlias()
-
-
-
+    let alias = generateAlias();
 
     let payload: Partial<IKeitaroCampaign> = {
         // Унікальні поля
@@ -301,24 +292,19 @@ async function cloneOWCampaign(app: IApp, platform?: EPlatform): Promise<IKeitar
         parameters: prepareOWCampaignParameters(app),
 
         // Неунікальні поля з оригінальної кампанії
-        type: originalCampaign.type,                    // тип (position)
-        state: originalCampaign.state,                  // стан (active)
-        cost_type: originalCampaign.cost_type,         // тип оплати (CPS)
-        cost_value: originalCampaign.cost_value,       // вартість
-        cost_currency: originalCampaign.cost_currency,  // валюта (USD)
-        uniqueness_period: originalCampaign.uniqueness_period,  // період унікальності (8760 годин)
-        cookies_ttl: originalCampaign.cookies_ttl,      // термін дії cookies
-        notes: originalCampaign.notes,                  // нотатки
-        collect_clicks: originalCampaign.collect_clicks,  // збір кліків
-        uniqueness_type: originalCampaign.uniqueness_type,  // тип унікальності (IP і user-agent)
-    }
-
-  
-
- 
-
+        type: originalCampaign.type,
+        state: originalCampaign.state,
+        cost_type: originalCampaign.cost_type,
+        cost_value: originalCampaign.cost_value,
+        cost_currency: originalCampaign.cost_currency,
+        uniqueness_period: originalCampaign.uniqueness_period,
+        cookies_ttl: originalCampaign.cookies_ttl,
+        notes: originalCampaign.notes,
+        collect_clicks: originalCampaign.collect_clicks,
+        uniqueness_type: originalCampaign.uniqueness_type,
+    };
 
-    const newCampaign : IKeitaroCampaign = await createCampaign(payload)
+    const newCampaign: IKeitaroCampaign = await createCampaign(payload);
 
     for (const stream of originalStreams) {
         await keitaroApi.post('streams', {
@@ -347,12 +333,6 @@ async function cloneOWCampaign(app: IApp, platform?: EPlatform): Promise<IKeitar
     });
 
     const updatedCampaign = await getCampaignById(newCampaign.id);
- 
-
-
-
-
-
 
     return updatedCampaign;
 }

package/src/panel/user.ts

@@ -14,7 +14,9 @@ export enum PanelUserAccessScope {
     OFFERWALL_RO,
     OFFERWALL_RW,
 
-    ASO_LOGS
+    ASO_LOGS,
+
+    MANAGER
 }
 
 export interface IPanelUser extends Document {