@greatapps/common 1.1.446 → 1.1.448

package/dist/modules/plans/services/plans.service.mjs

@@ -1,5 +1,5 @@
 import "server-only";
-import { api, apiClient } from "@greatapps/common/server";
+import { api, getUserContext } from "@greatapps/common/server";
 import { ApiError, buildQueryParams, PlanSchema } from "@greatapps/common";
 import greatCache from "@greatapps/cache";
 const PLANS_CACHE_TTL = 604800;
@@ -22,7 +22,11 @@ class PlansService {
    * GET /{id_wl}/plans?active=true&search=client&sort=id:ASC
    */
   async listPlans(params) {
-    const cacheKey = this.buildCacheKey("plans", params);
+    const { id_account } = await getUserContext();
+    const cacheKey = this.buildCacheKey("plans", {
+      ...params,
+      id_account
+    });
     const cachedData = await this.cache.select(cacheKey);
     if (cachedData.status == 1 && "data" in cachedData && cachedData.data) {
       const data2 = JSON.parse(cachedData.data);
@@ -31,10 +35,11 @@ class PlansService {
     const query = buildQueryParams({
       sort: params?.sort ?? "id:ASC",
       active: params?.active,
-      search: params?.search
+      search: params?.search,
+      id_account
     });
     const url = `/plans${query ? `?${query}` : ""}`;
-    const response = await apiClient.get(url);
+    const response = await api.apps.get(url);
     if (response.status === 0) {
       throw new ApiError(
         response.message || "Erro ao listar planos",
@@ -52,14 +57,18 @@ class PlansService {
     };
   }
   async findById(idPlan) {
-    const cacheKey = this.buildCacheKey(`plan-${idPlan}`);
+    const { id_account } = await getUserContext();
+    const cacheKey = this.buildCacheKey(`plan-${idPlan}`, {
+      id_account: String(id_account)
+    });
     const cachedData = await this.cache.select(cacheKey);
     if (cachedData.status == 1 && "data" in cachedData && cachedData.data) {
       const data = JSON.parse(cachedData.data);
       return { data, success: true };
     }
+    const query = buildQueryParams({ type: "client", id_account });
     const response = await api.apps.get(
-      `/plans/${idPlan}?type=client`
+      `/plans/${idPlan}?${query}`
     );
     if (response.status === 0) {
       throw new ApiError(
@@ -69,11 +78,7 @@ class PlansService {
       );
     }
     if (!response.data?.length) {
-      throw new ApiError(
-        "Plano n\xE3o encontrado",
-        "PLAN_NOT_FOUND",
-        404
-      );
+      throw new ApiError("Plano n\xE3o encontrado", "PLAN_NOT_FOUND", 404);
     }
     const plan = PlanSchema.parse(response.data[0]);
     await this.cache.insert(cacheKey, JSON.stringify(plan), PLANS_CACHE_TTL);

package/dist/modules/plans/services/plans.service.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/plans/services/plans.service.ts"],"sourcesContent":["import 'server-only';\n\nimport { api, apiClient } from '@greatapps/common/server';\nimport { ApiError, buildQueryParams, PlanSchema } from '@greatapps/common';\nimport type { ApiPaginatedActionResult, PaginatedSuccessResult, Plan, SuccessResult } from '@greatapps/common';\nimport greatCache from '@greatapps/cache';\n\nexport type ListPlansParams = {\n  sort?: string;\n  active?: boolean;\n  search?: string;\n};\n\nconst PLANS_CACHE_TTL = 604800;\n\nclass PlansService {\n  private cache = new greatCache({\n    service: 'plans',\n    version: '1.0.2',\n    domain: 'whitelabel-cache.greatapps.com.br',\n    ambient: process.env.NODE_ENV || 'development',\n  });\n\n  private buildCacheKey(key: string, params?: ListPlansParams): string {\n    const sort = params?.sort ?? 'id:ASC';\n    const active = params?.active ?? '';\n    const search = params?.search ?? '';\n    return `${key}-${sort}-${active}-${search}-v2`;\n  }\n\n  /**\n   * Lista planos do whitelabel.\n   * Exemplo:\n   * GET /{id_wl}/plans?active=true&search=client&sort=id:ASC\n   */\n  async listPlans(params?: ListPlansParams): Promise<PaginatedSuccessResult<Plan>> {\n    const cacheKey = this.buildCacheKey('plans', params);\n\n    const cachedData = await this.cache.select(cacheKey);\n\n    if (cachedData.status == 1 && 'data' in cachedData && cachedData.data) {\n      const data = JSON.parse(cachedData.data) as Plan[];\n      return { data, total: data.length, success: true };\n    }\n\n    const query = buildQueryParams({\n      sort: params?.sort ?? 'id:ASC',\n      active: params?.active,\n      search: params?.search,\n    });\n    const url = `/plans${query ? `?${query}` : ''}`;\n\n    const response = await apiClient.get<ApiPaginatedActionResult<Plan[]>>(url);\n\n    if (response.status === 0) {\n      throw new ApiError(\n        (response as { message?: string }).message || 'Erro ao listar planos',\n        'LIST_PLANS_FAILED',\n        400\n      );\n    }\n\n    const rawData = (response as { data?: unknown }).data;\n    const data = Array.isArray(rawData)\n      ? rawData.map((item) => PlanSchema.parse(item))\n      : [];\n\n    await this.cache.insert(cacheKey, JSON.stringify(data), PLANS_CACHE_TTL);\n\n    return {\n      data,\n      total: response.total,\n      success: true,\n    } satisfies PaginatedSuccessResult<Plan>;\n  }\n\n\n  async findById(idPlan: number | string): Promise<SuccessResult<Plan>> {\n    const cacheKey = this.buildCacheKey(`plan-${idPlan}`);\n\n    const cachedData = await this.cache.select(cacheKey);\n    \n    if (cachedData.status == 1 && 'data' in cachedData && cachedData.data) {\n      const data = JSON.parse(cachedData.data) as Plan;\n      return { data, success: true };\n    }\n\n    const response = await api.apps.get<ApiPaginatedActionResult<Plan>>(\n      `/plans/${idPlan}?type=client`\n    );\n\n    if (response.status === 0) {\n      throw new ApiError(\n        response.message || 'Erro ao buscar plano',\n        'FIND_PLAN_FAILED',\n        400\n      );\n    }\n\n    if (!response.data?.length) {\n      throw new ApiError(\n        'Plano não encontrado',\n        'PLAN_NOT_FOUND',\n        404\n      );\n    }\n\n    const plan = PlanSchema.parse(response.data[0]);\n\n    await this.cache.insert(cacheKey, JSON.stringify(plan), PLANS_CACHE_TTL);\n\n    return {\n      success: true,\n      data: plan,\n    };\n  }\n}\n\nexport const plansService = new PlansService();\n"],"mappings":"AAAA,OAAO;AAEP,SAAS,KAAK,iBAAiB;AAC/B,SAAS,UAAU,kBAAkB,kBAAkB;AAEvD,OAAO,gBAAgB;AAQvB,MAAM,kBAAkB;AAExB,MAAM,aAAa;AAAA,EACT,QAAQ,IAAI,WAAW;AAAA,IAC7B,SAAS;AAAA,IACT,SAAS;AAAA,IACT,QAAQ;AAAA,IACR,SAAS,QAAQ,IAAI,YAAY;AAAA,EACnC,CAAC;AAAA,EAEO,cAAc,KAAa,QAAkC;AACnE,UAAM,OAAO,QAAQ,QAAQ;AAC7B,UAAM,SAAS,QAAQ,UAAU;AACjC,UAAM,SAAS,QAAQ,UAAU;AACjC,WAAO,GAAG,GAAG,IAAI,IAAI,IAAI,MAAM,IAAI,MAAM;AAAA,EAC3C;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,MAAM,UAAU,QAAiE;AAC/E,UAAM,WAAW,KAAK,cAAc,SAAS,MAAM;AAEnD,UAAM,aAAa,MAAM,KAAK,MAAM,OAAO,QAAQ;AAEnD,QAAI,WAAW,UAAU,KAAK,UAAU,cAAc,WAAW,MAAM;AACrE,YAAMA,QAAO,KAAK,MAAM,WAAW,IAAI;AACvC,aAAO,EAAE,MAAAA,OAAM,OAAOA,MAAK,QAAQ,SAAS,KAAK;AAAA,IACnD;AAEA,UAAM,QAAQ,iBAAiB;AAAA,MAC7B,MAAM,QAAQ,QAAQ;AAAA,MACtB,QAAQ,QAAQ;AAAA,MAChB,QAAQ,QAAQ;AAAA,IAClB,CAAC;AACD,UAAM,MAAM,SAAS,QAAQ,IAAI,KAAK,KAAK,EAAE;AAE7C,UAAM,WAAW,MAAM,UAAU,IAAsC,GAAG;AAE1E,QAAI,SAAS,WAAW,GAAG;AACzB,YAAM,IAAI;AAAA,QACP,SAAkC,WAAW;AAAA,QAC9C;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAEA,UAAM,UAAW,SAAgC;AACjD,UAAM,OAAO,MAAM,QAAQ,OAAO,IAC9B,QAAQ,IAAI,CAAC,SAAS,WAAW,MAAM,IAAI,CAAC,IAC5C,CAAC;AAEL,UAAM,KAAK,MAAM,OAAO,UAAU,KAAK,UAAU,IAAI,GAAG,eAAe;AAEvE,WAAO;AAAA,MACL;AAAA,MACA,OAAO,SAAS;AAAA,MAChB,SAAS;AAAA,IACX;AAAA,EACF;AAAA,EAGA,MAAM,SAAS,QAAuD;AACpE,UAAM,WAAW,KAAK,cAAc,QAAQ,MAAM,EAAE;AAEpD,UAAM,aAAa,MAAM,KAAK,MAAM,OAAO,QAAQ;AAEnD,QAAI,WAAW,UAAU,KAAK,UAAU,cAAc,WAAW,MAAM;AACrE,YAAM,OAAO,KAAK,MAAM,WAAW,IAAI;AACvC,aAAO,EAAE,MAAM,SAAS,KAAK;AAAA,IAC/B;AAEA,UAAM,WAAW,MAAM,IAAI,KAAK;AAAA,MAC9B,UAAU,MAAM;AAAA,IAClB;AAEA,QAAI,SAAS,WAAW,GAAG;AACzB,YAAM,IAAI;AAAA,QACR,SAAS,WAAW;AAAA,QACpB;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAEA,QAAI,CAAC,SAAS,MAAM,QAAQ;AAC1B,YAAM,IAAI;AAAA,QACR;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAEA,UAAM,OAAO,WAAW,MAAM,SAAS,KAAK,CAAC,CAAC;AAE9C,UAAM,KAAK,MAAM,OAAO,UAAU,KAAK,UAAU,IAAI,GAAG,eAAe;AAEvE,WAAO;AAAA,MACL,SAAS;AAAA,MACT,MAAM;AAAA,IACR;AAAA,EACF;AACF;AAEO,MAAM,eAAe,IAAI,aAAa;","names":["data"]}
+{"version":3,"sources":["../../../../src/modules/plans/services/plans.service.ts"],"sourcesContent":["import \"server-only\";\n\nimport { api, apiClient, getUserContext } from \"@greatapps/common/server\";\nimport { ApiError, buildQueryParams, PlanSchema } from \"@greatapps/common\";\nimport type {\n  ApiPaginatedActionResult,\n  PaginatedSuccessResult,\n  Plan,\n  SuccessResult,\n} from \"@greatapps/common\";\nimport greatCache from \"@greatapps/cache\";\n\nexport type ListPlansParams = {\n  sort?: string;\n  active?: boolean;\n  search?: string;\n};\n\nconst PLANS_CACHE_TTL = 604800;\n\nclass PlansService {\n  private cache = new greatCache({\n    service: \"plans\",\n    version: \"1.0.2\",\n    domain: \"whitelabel-cache.greatapps.com.br\",\n    ambient: process.env.NODE_ENV || \"development\",\n  });\n\n  private buildCacheKey(key: string, params?: Record<string, unknown>): string {\n    const sort = params?.sort ?? \"id:ASC\";\n    const active = params?.active ?? \"\";\n    const search = params?.search ?? \"\";\n    return `${key}-${sort}-${active}-${search}-v2`;\n  }\n\n  /**\n   * Lista planos do whitelabel.\n   * Exemplo:\n   * GET /{id_wl}/plans?active=true&search=client&sort=id:ASC\n   */\n  async listPlans(\n    params?: ListPlansParams,\n  ): Promise<PaginatedSuccessResult<Plan>> {\n    const { id_account } = await getUserContext();\n    const cacheKey = this.buildCacheKey(\"plans\", {\n      ...params,\n      id_account,\n    });\n\n    const cachedData = await this.cache.select(cacheKey);\n\n    if (cachedData.status == 1 && \"data\" in cachedData && cachedData.data) {\n      const data = JSON.parse(cachedData.data) as Plan[];\n      return { data, total: data.length, success: true };\n    }\n\n    const query = buildQueryParams({\n      sort: params?.sort ?? \"id:ASC\",\n      active: params?.active,\n      search: params?.search,\n      id_account: id_account,\n    });\n    const url = `/plans${query ? `?${query}` : \"\"}`;\n\n    const response = await api.apps.get<ApiPaginatedActionResult<Plan[]>>(url);\n\n    if (response.status === 0) {\n      throw new ApiError(\n        (response as { message?: string }).message || \"Erro ao listar planos\",\n        \"LIST_PLANS_FAILED\",\n        400,\n      );\n    }\n\n    const rawData = (response as { data?: unknown }).data;\n    const data = Array.isArray(rawData)\n      ? rawData.map((item) => PlanSchema.parse(item))\n      : [];\n\n    await this.cache.insert(cacheKey, JSON.stringify(data), PLANS_CACHE_TTL);\n\n    return {\n      data,\n      total: response.total,\n      success: true,\n    } satisfies PaginatedSuccessResult<Plan>;\n  }\n\n  async findById(idPlan: number | string): Promise<SuccessResult<Plan>> {\n    const { id_account } = await getUserContext();\n    const cacheKey = this.buildCacheKey(`plan-${idPlan}`, {\n      id_account: String(id_account),\n    });\n\n    const cachedData = await this.cache.select(cacheKey);\n\n    if (cachedData.status == 1 && \"data\" in cachedData && cachedData.data) {\n      const data = JSON.parse(cachedData.data) as Plan;\n      return { data, success: true };\n    }\n\n    const query = buildQueryParams({ type: \"client\", id_account });\n\n    const response = await api.apps.get<ApiPaginatedActionResult<Plan>>(\n      `/plans/${idPlan}?${query}`,\n    );\n\n    if (response.status === 0) {\n      throw new ApiError(\n        response.message || \"Erro ao buscar plano\",\n        \"FIND_PLAN_FAILED\",\n        400,\n      );\n    }\n\n    if (!response.data?.length) {\n      throw new ApiError(\"Plano não encontrado\", \"PLAN_NOT_FOUND\", 404);\n    }\n\n    const plan = PlanSchema.parse(response.data[0]);\n\n    await this.cache.insert(cacheKey, JSON.stringify(plan), PLANS_CACHE_TTL);\n\n    return {\n      success: true,\n      data: plan,\n    };\n  }\n}\n\nexport const plansService = new PlansService();\n"],"mappings":"AAAA,OAAO;AAEP,SAAS,KAAgB,sBAAsB;AAC/C,SAAS,UAAU,kBAAkB,kBAAkB;AAOvD,OAAO,gBAAgB;AAQvB,MAAM,kBAAkB;AAExB,MAAM,aAAa;AAAA,EACT,QAAQ,IAAI,WAAW;AAAA,IAC7B,SAAS;AAAA,IACT,SAAS;AAAA,IACT,QAAQ;AAAA,IACR,SAAS,QAAQ,IAAI,YAAY;AAAA,EACnC,CAAC;AAAA,EAEO,cAAc,KAAa,QAA0C;AAC3E,UAAM,OAAO,QAAQ,QAAQ;AAC7B,UAAM,SAAS,QAAQ,UAAU;AACjC,UAAM,SAAS,QAAQ,UAAU;AACjC,WAAO,GAAG,GAAG,IAAI,IAAI,IAAI,MAAM,IAAI,MAAM;AAAA,EAC3C;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,MAAM,UACJ,QACuC;AACvC,UAAM,EAAE,WAAW,IAAI,MAAM,eAAe;AAC5C,UAAM,WAAW,KAAK,cAAc,SAAS;AAAA,MAC3C,GAAG;AAAA,MACH;AAAA,IACF,CAAC;AAED,UAAM,aAAa,MAAM,KAAK,MAAM,OAAO,QAAQ;AAEnD,QAAI,WAAW,UAAU,KAAK,UAAU,cAAc,WAAW,MAAM;AACrE,YAAMA,QAAO,KAAK,MAAM,WAAW,IAAI;AACvC,aAAO,EAAE,MAAAA,OAAM,OAAOA,MAAK,QAAQ,SAAS,KAAK;AAAA,IACnD;AAEA,UAAM,QAAQ,iBAAiB;AAAA,MAC7B,MAAM,QAAQ,QAAQ;AAAA,MACtB,QAAQ,QAAQ;AAAA,MAChB,QAAQ,QAAQ;AAAA,MAChB;AAAA,IACF,CAAC;AACD,UAAM,MAAM,SAAS,QAAQ,IAAI,KAAK,KAAK,EAAE;AAE7C,UAAM,WAAW,MAAM,IAAI,KAAK,IAAsC,GAAG;AAEzE,QAAI,SAAS,WAAW,GAAG;AACzB,YAAM,IAAI;AAAA,QACP,SAAkC,WAAW;AAAA,QAC9C;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAEA,UAAM,UAAW,SAAgC;AACjD,UAAM,OAAO,MAAM,QAAQ,OAAO,IAC9B,QAAQ,IAAI,CAAC,SAAS,WAAW,MAAM,IAAI,CAAC,IAC5C,CAAC;AAEL,UAAM,KAAK,MAAM,OAAO,UAAU,KAAK,UAAU,IAAI,GAAG,eAAe;AAEvE,WAAO;AAAA,MACL;AAAA,MACA,OAAO,SAAS;AAAA,MAChB,SAAS;AAAA,IACX;AAAA,EACF;AAAA,EAEA,MAAM,SAAS,QAAuD;AACpE,UAAM,EAAE,WAAW,IAAI,MAAM,eAAe;AAC5C,UAAM,WAAW,KAAK,cAAc,QAAQ,MAAM,IAAI;AAAA,MACpD,YAAY,OAAO,UAAU;AAAA,IAC/B,CAAC;AAED,UAAM,aAAa,MAAM,KAAK,MAAM,OAAO,QAAQ;AAEnD,QAAI,WAAW,UAAU,KAAK,UAAU,cAAc,WAAW,MAAM;AACrE,YAAM,OAAO,KAAK,MAAM,WAAW,IAAI;AACvC,aAAO,EAAE,MAAM,SAAS,KAAK;AAAA,IAC/B;AAEA,UAAM,QAAQ,iBAAiB,EAAE,MAAM,UAAU,WAAW,CAAC;AAE7D,UAAM,WAAW,MAAM,IAAI,KAAK;AAAA,MAC9B,UAAU,MAAM,IAAI,KAAK;AAAA,IAC3B;AAEA,QAAI,SAAS,WAAW,GAAG;AACzB,YAAM,IAAI;AAAA,QACR,SAAS,WAAW;AAAA,QACpB;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAEA,QAAI,CAAC,SAAS,MAAM,QAAQ;AAC1B,YAAM,IAAI,SAAS,2BAAwB,kBAAkB,GAAG;AAAA,IAClE;AAEA,UAAM,OAAO,WAAW,MAAM,SAAS,KAAK,CAAC,CAAC;AAE9C,UAAM,KAAK,MAAM,OAAO,UAAU,KAAK,UAAU,IAAI,GAAG,eAAe;AAEvE,WAAO;AAAA,MACL,SAAS;AAAA,MACT,MAAM;AAAA,IACR;AAAA,EACF;AACF;AAEO,MAAM,eAAe,IAAI,aAAa;","names":["data"]}

package/dist/modules/subscriptions/types/subscription.type.mjs

@@ -48,7 +48,37 @@ const SubscriptionSchema = z.object({
   card_name: z.string().nullable().optional(),
   card_brand: z.string().nullable().optional(),
   card_number: z.string().nullable().optional(),
-  items: z.array(SubscriptionItemSchema)
+  items: z.array(SubscriptionItemSchema),
+  pending_change: z.object({
+    schedule_id: z.string(),
+    schedule_status: z.string(),
+    kind: z.string(),
+    takes_effect_at: z.number(),
+    takes_effect_at_iso: z.string(),
+    new_plan: z.object({
+      id: z.number(),
+      name: z.string(),
+      periodicity: z.number(),
+      value: z.number(),
+      value_gross: z.number()
+    }),
+    new_items: z.array(z.object({
+      price_id: z.string(),
+      id_addon: z.number().nullable(),
+      addon_name: z.string(),
+      quantity: z.number(),
+      unit_value: z.number(),
+      value: z.number(),
+      is_plan_base: z.boolean(),
+      is_ai_credit: z.boolean()
+    })),
+    new_discounts: z.array(z.unknown()),
+    changes: z.array(z.object({
+      type: z.string(),
+      from: z.unknown(),
+      to: z.unknown()
+    }))
+  }).nullable().optional()
 });
 export {
   SubscriptionItemSchema,

package/dist/modules/subscriptions/types/subscription.type.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/subscriptions/types/subscription.type.ts"],"sourcesContent":["import z from 'zod';\r\n\r\nexport const SubscriptionItemSchema = z.object({\r\n  id: z.union([z.number(), z.string()]),\r\n  deleted: z.number(),\r\n  datetime_alt: z.coerce.date().nullable().optional(),\r\n  datetime_del: z.coerce.date().nullable().optional(),\r\n  datetime_add: z.coerce.date(),\r\n  id_wl: z.number(),\r\n  id_subscription: z.union([z.number(), z.string()]),\r\n  id_addon: z.number().nullable(),\r\n  addon_name: z.string().optional(),\r\n  value: z.number(),\r\n  currency: z.string(),\r\n  quantity: z.number(),\r\n  payment_status: z.number(),\r\n  id_charge: z.union([z.number(), z.string()]).nullable(),\r\n  trial: z.boolean(),\r\n  trial_ends_at: z.coerce.date().nullable().optional(),\r\n});\r\n\r\nexport type SubscriptionItem = z.infer<typeof SubscriptionItemSchema>;\r\n\r\nexport const SubscriptionSchema = z.object({\r\n  id: z.union([z.number(), z.string()]),\r\n  deleted: z.number(),\r\n  datetime_alt: z.coerce.date().nullable().optional(),\r\n  datetime_del: z.coerce.date().nullable().optional(),\r\n  datetime_add: z.coerce.date(),\r\n  id_wl: z.number(),\r\n  id_account: z.union([z.number(), z.string()]),\r\n  id_card: z.union([z.number(), z.string()]).nullable(),\r\n  id_coupon: z.union([z.number(), z.string()]).nullable(),\r\n  type: z.string(),\r\n  payment_method: z.number().nullable(),\r\n  periodicity: z.coerce.number().nullable(),\r\n  value: z.number().nullable(),\r\n  id_product: z.number(),\r\n  id_plan: z.number(),\r\n  plan_name: z.string().nullable().optional(),\r\n  id_gateway: z.union([z.number(), z.string()]).nullable(),\r\n  gateway_account: z.string().nullable(),\r\n  date_hiring: z.coerce.date().nullable(),\r\n  date_due: z.coerce.date(),\r\n  date_cancellation: z.coerce.date().nullable(),\r\n  date_verification: z.coerce.date().nullable(),\r\n  cancellation_reason: z.string().nullable(),\r\n  cancellation_description: z.string().nullable(),\r\n  active: z.boolean(),\r\n  charged: z.boolean(),\r\n  datetime_last_update_periodicity: z.coerce.date().nullable().optional(),\r\n  card_name: z.string().nullable().optional(),\r\n  card_brand: z.string().nullable().optional(),\r\n  card_number: z.string().nullable().optional(),\r\n  items: z.array(SubscriptionItemSchema),\r\n});\r\n\r\nexport type Subscription = z.infer<typeof SubscriptionSchema>;\r\n\r\nexport interface FindSubscriptionsParams {\r\n  active?: boolean;\r\n  trial?: boolean;\r\n  date_start?: string;\r\n  date_end?: string;\r\n  date_hiring_start?: string;\r\n  date_hiring_end?: string;\r\n  limit?: number;\r\n}\r\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../../src/modules/subscriptions/types/subscription.type.ts"],"sourcesContent":["import z from 'zod';\r\n\r\nexport const SubscriptionItemSchema = z.object({\r\n  id: z.union([z.number(), z.string()]),\r\n  deleted: z.number(),\r\n  datetime_alt: z.coerce.date().nullable().optional(),\r\n  datetime_del: z.coerce.date().nullable().optional(),\r\n  datetime_add: z.coerce.date(),\r\n  id_wl: z.number(),\r\n  id_subscription: z.union([z.number(), z.string()]),\r\n  id_addon: z.number().nullable(),\r\n  addon_name: z.string().optional(),\r\n  value: z.number(),\r\n  currency: z.string(),\r\n  quantity: z.number(),\r\n  payment_status: z.number(),\r\n  id_charge: z.union([z.number(), z.string()]).nullable(),\r\n  trial: z.boolean(),\r\n  trial_ends_at: z.coerce.date().nullable().optional(),\r\n});\r\n\r\nexport type SubscriptionItem = z.infer<typeof SubscriptionItemSchema>;\r\n\r\nexport const SubscriptionSchema = z.object({\r\n  id: z.union([z.number(), z.string()]),\r\n  deleted: z.number(),\r\n  datetime_alt: z.coerce.date().nullable().optional(),\r\n  datetime_del: z.coerce.date().nullable().optional(),\r\n  datetime_add: z.coerce.date(),\r\n  id_wl: z.number(),\r\n  id_account: z.union([z.number(), z.string()]),\r\n  id_card: z.union([z.number(), z.string()]).nullable(),\r\n  id_coupon: z.union([z.number(), z.string()]).nullable(),\r\n  type: z.string(),\r\n  payment_method: z.number().nullable(),\r\n  periodicity: z.coerce.number().nullable(),\r\n  value: z.number().nullable(),\r\n  id_product: z.number(),\r\n  id_plan: z.number(),\r\n  plan_name: z.string().nullable().optional(),\r\n  id_gateway: z.union([z.number(), z.string()]).nullable(),\r\n  gateway_account: z.string().nullable(),\r\n  date_hiring: z.coerce.date().nullable(),\r\n  date_due: z.coerce.date(),\r\n  date_cancellation: z.coerce.date().nullable(),\r\n  date_verification: z.coerce.date().nullable(),\r\n  cancellation_reason: z.string().nullable(),\r\n  cancellation_description: z.string().nullable(),\r\n  active: z.boolean(),\r\n  charged: z.boolean(),\r\n  datetime_last_update_periodicity: z.coerce.date().nullable().optional(),\r\n  card_name: z.string().nullable().optional(),\r\n  card_brand: z.string().nullable().optional(),\r\n  card_number: z.string().nullable().optional(),\r\n  items: z.array(SubscriptionItemSchema),\r\n  pending_change: z.object({\r\n    schedule_id: z.string(),\r\n    schedule_status: z.string(),\r\n    kind: z.string(),\r\n    takes_effect_at: z.number(),\r\n    takes_effect_at_iso: z.string(),\r\n    new_plan: z.object({\r\n      id: z.number(),\r\n      name: z.string(),\r\n      periodicity: z.number(),\r\n      value: z.number(),\r\n      value_gross: z.number(),\r\n    }),\r\n    new_items: z.array(z.object({\r\n      price_id: z.string(),\r\n      id_addon: z.number().nullable(),\r\n      addon_name: z.string(),\r\n      quantity: z.number(),\r\n      unit_value: z.number(),\r\n      value: z.number(),\r\n      is_plan_base: z.boolean(),\r\n      is_ai_credit: z.boolean(),\r\n    })),\r\n    new_discounts: z.array(z.unknown()),\r\n    changes: z.array(z.object({\r\n      type: z.string(),\r\n      from: z.unknown(),\r\n      to: z.unknown(),\r\n    })),\r\n  }).nullable().optional(),\r\n});\r\n\r\nexport type Subscription = z.infer<typeof SubscriptionSchema>;\r\n\r\nexport interface FindSubscriptionsParams {\r\n  active?: boolean;\r\n  trial?: boolean;\r\n  date_start?: string;\r\n  date_end?: string;\r\n  date_hiring_start?: string;\r\n  date_hiring_end?: string;\r\n  limit?: number;\r\n}\r\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@greatapps/common",
-  "version": "1.1.446",
+  "version": "1.1.448",
   "description": "Shared library for GreatApps frontend applications",
   "main": "./dist/index.mjs",
   "types": "./src/index.ts",

package/src/modules/plans/services/plans.service.ts

@@ -1,9 +1,14 @@
-import 'server-only';
-
-import { api, apiClient } from '@greatapps/common/server';
-import { ApiError, buildQueryParams, PlanSchema } from '@greatapps/common';
-import type { ApiPaginatedActionResult, PaginatedSuccessResult, Plan, SuccessResult } from '@greatapps/common';
-import greatCache from '@greatapps/cache';
+import "server-only";
+
+import { api, apiClient, getUserContext } from "@greatapps/common/server";
+import { ApiError, buildQueryParams, PlanSchema } from "@greatapps/common";
+import type {
+  ApiPaginatedActionResult,
+  PaginatedSuccessResult,
+  Plan,
+  SuccessResult,
+} from "@greatapps/common";
+import greatCache from "@greatapps/cache";
 
 export type ListPlansParams = {
   sort?: string;
@@ -15,16 +20,16 @@ const PLANS_CACHE_TTL = 604800;
 
 class PlansService {
   private cache = new greatCache({
-    service: 'plans',
-    version: '1.0.2',
-    domain: 'whitelabel-cache.greatapps.com.br',
-    ambient: process.env.NODE_ENV || 'development',
+    service: "plans",
+    version: "1.0.2",
+    domain: "whitelabel-cache.greatapps.com.br",
+    ambient: process.env.NODE_ENV || "development",
   });
 
-  private buildCacheKey(key: string, params?: ListPlansParams): string {
-    const sort = params?.sort ?? 'id:ASC';
-    const active = params?.active ?? '';
-    const search = params?.search ?? '';
+  private buildCacheKey(key: string, params?: Record<string, unknown>): string {
+    const sort = params?.sort ?? "id:ASC";
+    const active = params?.active ?? "";
+    const search = params?.search ?? "";
     return `${key}-${sort}-${active}-${search}-v2`;
   }
 
@@ -33,30 +38,37 @@ class PlansService {
    * Exemplo:
    * GET /{id_wl}/plans?active=true&search=client&sort=id:ASC
    */
-  async listPlans(params?: ListPlansParams): Promise<PaginatedSuccessResult<Plan>> {
-    const cacheKey = this.buildCacheKey('plans', params);
+  async listPlans(
+    params?: ListPlansParams,
+  ): Promise<PaginatedSuccessResult<Plan>> {
+    const { id_account } = await getUserContext();
+    const cacheKey = this.buildCacheKey("plans", {
+      ...params,
+      id_account,
+    });
 
     const cachedData = await this.cache.select(cacheKey);
 
-    if (cachedData.status == 1 && 'data' in cachedData && cachedData.data) {
+    if (cachedData.status == 1 && "data" in cachedData && cachedData.data) {
       const data = JSON.parse(cachedData.data) as Plan[];
       return { data, total: data.length, success: true };
     }
 
     const query = buildQueryParams({
-      sort: params?.sort ?? 'id:ASC',
+      sort: params?.sort ?? "id:ASC",
       active: params?.active,
       search: params?.search,
+      id_account: id_account,
     });
-    const url = `/plans${query ? `?${query}` : ''}`;
+    const url = `/plans${query ? `?${query}` : ""}`;
 
-    const response = await apiClient.get<ApiPaginatedActionResult<Plan[]>>(url);
+    const response = await api.apps.get<ApiPaginatedActionResult<Plan[]>>(url);
 
     if (response.status === 0) {
       throw new ApiError(
-        (response as { message?: string }).message || 'Erro ao listar planos',
-        'LIST_PLANS_FAILED',
-        400
+        (response as { message?: string }).message || "Erro ao listar planos",
+        "LIST_PLANS_FAILED",
+        400,
       );
     }
 
@@ -74,35 +86,35 @@ class PlansService {
     } satisfies PaginatedSuccessResult<Plan>;
   }
 
-
   async findById(idPlan: number | string): Promise<SuccessResult<Plan>> {
-    const cacheKey = this.buildCacheKey(`plan-${idPlan}`);
+    const { id_account } = await getUserContext();
+    const cacheKey = this.buildCacheKey(`plan-${idPlan}`, {
+      id_account: String(id_account),
+    });
 
     const cachedData = await this.cache.select(cacheKey);
-    
-    if (cachedData.status == 1 && 'data' in cachedData && cachedData.data) {
+
+    if (cachedData.status == 1 && "data" in cachedData && cachedData.data) {
       const data = JSON.parse(cachedData.data) as Plan;
       return { data, success: true };
     }
 
+    const query = buildQueryParams({ type: "client", id_account });
+
     const response = await api.apps.get<ApiPaginatedActionResult<Plan>>(
-      `/plans/${idPlan}?type=client`
+      `/plans/${idPlan}?${query}`,
     );
 
     if (response.status === 0) {
       throw new ApiError(
-        response.message || 'Erro ao buscar plano',
-        'FIND_PLAN_FAILED',
-        400
+        response.message || "Erro ao buscar plano",
+        "FIND_PLAN_FAILED",
+        400,
       );
     }
 
     if (!response.data?.length) {
-      throw new ApiError(
-        'Plano não encontrado',
-        'PLAN_NOT_FOUND',
-        404
-      );
+      throw new ApiError("Plano não encontrado", "PLAN_NOT_FOUND", 404);
     }
 
     const plan = PlanSchema.parse(response.data[0]);

package/src/modules/subscriptions/types/subscription.type.ts

@@ -53,6 +53,36 @@ export const SubscriptionSchema = z.object({
   card_brand: z.string().nullable().optional(),
   card_number: z.string().nullable().optional(),
   items: z.array(SubscriptionItemSchema),
+  pending_change: z.object({
+    schedule_id: z.string(),
+    schedule_status: z.string(),
+    kind: z.string(),
+    takes_effect_at: z.number(),
+    takes_effect_at_iso: z.string(),
+    new_plan: z.object({
+      id: z.number(),
+      name: z.string(),
+      periodicity: z.number(),
+      value: z.number(),
+      value_gross: z.number(),
+    }),
+    new_items: z.array(z.object({
+      price_id: z.string(),
+      id_addon: z.number().nullable(),
+      addon_name: z.string(),
+      quantity: z.number(),
+      unit_value: z.number(),
+      value: z.number(),
+      is_plan_base: z.boolean(),
+      is_ai_credit: z.boolean(),
+    })),
+    new_discounts: z.array(z.unknown()),
+    changes: z.array(z.object({
+      type: z.string(),
+      from: z.unknown(),
+      to: z.unknown(),
+    })),
+  }).nullable().optional(),
 });
 
 export type Subscription = z.infer<typeof SubscriptionSchema>;