@cloudcommerce/app-pagarme-v5 2.41.3 → 2.41.6

package/lib-mjs/events-to-pagarme5.mjs

@@ -4,7 +4,6 @@ import logger from 'firebase-functions/logger';
 import { getFirestore } from 'firebase-admin/firestore';
 import ecomUtils from '@ecomplus/utils';
 import axios from './functions-lib/pagarme/create-axios.mjs';
-import { getOrderWithQueryString } from './functions-lib/api-utils.mjs';
 import { getDocFirestore } from './functions-lib/firestore-utils.mjs';
 
 const colletionFirebase = getFirestore().collection('pagarmeV5Subscriptions');
@@ -32,8 +31,11 @@ const eventOrderCancelled = async (
         return null;
       } catch (err) {
         logger.error(err);
-        await api.patch(order._id, { status: 'open' })
-          .catch(logger.error);
+        try {
+          await api.patch(order._id, { status: 'open' });
+        } catch (_err) {
+          logger.error(_err);
+        }
         return null;
       }
     } else {
@@ -55,8 +57,7 @@ const eventProducts = async (
   let query = 'status!=cancelled&transactions.type=recurrence';
   query += '&transactions.app.intermediator.code=pagarme';
   query += `&items.product_id=${product._id}`;
-
-  const result = await getOrderWithQueryString(query);
+  const { data: { result } } = await api.get(`orders?${query}`);
 
   if (result && result.length) {
     let i = 0;

package/lib-mjs/functions-lib/api-utils.mjs

@@ -11,18 +11,17 @@ const addPaymentHistory = async (orderId, body) => {
 };
 
 const updateTransaction = (orderId, body, transactionId) => {
-  const urlTransaction = transactionId ? `/${transactionId}` : '';
-  const method = transactionId ? 'PATCH' : 'POST';
-
-  return api[method](`orders/${orderId}/transactions${urlTransaction}`, body);
+  if (transactionId) {
+    return api.patch(`orders/${orderId}/transactions/${transactionId}`, body);
+  }
+  return api.post(`orders/${orderId}/transactions`, body);
 };
 
 const getOrderIntermediatorTransactionId = async (invoiceId) => {
-  let queryString = `?transactions.intermediator.transaction_id=${invoiceId}`;
+  let queryString = `transactions.intermediator.transaction_id=${invoiceId}`;
   queryString += '&fields=transactions,financial_status.current,status';
-  const data = await api.get(`orders${queryString}`);
-
-  return data?.result.length ? data?.result[0] : null;
+  const { data } = await api.get(`orders?${queryString}`);
+  return data.result[0] || null;
 };
 
 const checkItemsAndRecalculeteOrder = (amount, items, plan, itemsPagarme) => {
@@ -154,17 +153,6 @@ const createNewOrderBasedOld = (oldOrder, plan, status, charge, subscriptionPaga
   return api.post('orders', body);
 };
 
-const getOrderWithQueryString = async (query) => {
-  const { data } = await api.get(`orders?${query}`);
-
-  return data?.result.length ? data?.result : null;
-};
-
-const getProductById = async (productId) => {
-  const { data } = await api.get(`products/${productId}`);
-  return data;
-};
-
 const checkItemCategory = async (categoryIds, itemsPagarme, itemsApi) => {
   let i = 0;
 
@@ -178,7 +166,7 @@ const checkItemCategory = async (categoryIds, itemsPagarme, itemsApi) => {
 
     if (itemFound && !isItemFreigth) {
       // eslint-disable-next-line no-await-in-loop
-      const product = await getProductById(itemFound.product_id);
+      const { data: product } = await api.get(`products/${itemFound.product_id}`);
       if (product.categories) {
         let canSign = false;
         product.categories.forEach((category) => {
@@ -210,7 +198,5 @@ export {
   updateTransaction,
   getOrderIntermediatorTransactionId,
   createNewOrderBasedOld,
-  getOrderWithQueryString,
-  getProductById,
   checkItemCategory,
 };

package/lib-mjs/pagarme5-webhook.mjs

@@ -1,7 +1,7 @@
 import { getFirestore } from 'firebase-admin/firestore';
-import config from '@cloudcommerce/firebase/lib/config';
 import api from '@cloudcommerce/api';
-import logger from 'firebase-functions/logger';
+import { logger } from '@cloudcommerce/firebase/lib/config';
+import getAppData from '@cloudcommerce/firebase/lib/helpers/get-app-data';
 import axios from './functions-lib/pagarme/create-axios.mjs';
 import {
   getOrderById,
@@ -14,27 +14,13 @@ import {
 } from './functions-lib/api-utils.mjs';
 import { parserChangeStatusToEcom } from './functions-lib/pagarme/parses-utils.mjs';
 
-const getAppData = async () => {
-  return new Promise((resolve, reject) => {
-    api.get(
-      `applications?app_id=${config.get().apps.pagarMeV5.appId}&fields=hidden_data`,
-    )
-      .then(({ data: result }) => {
-        resolve(result[0]);
-      })
-      .catch((err) => {
-        reject(err);
-      });
-  });
-};
-
 const handleWehook = async (req, res) => {
   const colletionFirebase = getFirestore().collection('pagarmeV5Subscriptions');
   const { body } = req;
 
   try {
     const type = body.type;
-    const appData = await getAppData();
+    const appData = await getAppData('pagarMeV5');
 
     if (!process.env.PAGARMEV5_API_TOKEN) {
       const pagarmeApiToken = appData.pagarme_api_token;
@@ -42,7 +28,6 @@ const handleWehook = async (req, res) => {
         process.env.PAGARMEV5_API_TOKEN = pagarmeApiToken;
       } else {
         logger.warn('Missing PAGARMEV5 API TOKEN');
-
         return res.status(401)
           .send({
             error: 'NO_PAGARME_KEYS',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pagarme-v5",
   "type": "module",
-  "version": "2.41.3",
+  "version": "2.41.6",
   "description": "e-com.plus Cloud Commerce app to integrate Pagar.me API v5 with recurring payments",
   "main": "lib/index.js",
   "exports": {
@@ -31,12 +31,12 @@
     "axios": "^1.8.4",
     "firebase-admin": "^13.2.0",
     "firebase-functions": "^6.3.2",
-    "@cloudcommerce/api": "2.41.3",
-    "@cloudcommerce/firebase": "2.41.3"
+    "@cloudcommerce/api": "2.41.6",
+    "@cloudcommerce/firebase": "2.41.6"
   },
   "devDependencies": {
-    "@cloudcommerce/types": "2.41.3",
-    "@cloudcommerce/test-base": "2.41.3"
+    "@cloudcommerce/test-base": "2.41.6",
+    "@cloudcommerce/types": "2.41.6"
   },
   "scripts": {
     "build": "bash scripts/build.sh",