Migrate payments and Transactions to typescript

scripts/ledger/refund-host-fee-on-transaction.ts

@@ -50,7 +50,7 @@ const main = async () => {
     `Refunding host fee for transaction ${transactionGroup} (${transaction.description}) on behalf of ${userCollectiveSlug}`,
   );
   if (!DRY_RUN) {
-    await refundHostFee(transaction, user, 0, uuid(), null);
+    await refundHostFee(transaction, user, 0, uuid());
   }
 };
 

scripts/ledger/split-host-fee-shares.ts

@@ -51,14 +51,9 @@ const migrate = async () => {
       console.log(`Migrated ${count}/${hostFeeTransactions.length} transactions`);
     }
 
-    const host = await models.Collective.findByPk(hostFeeTransaction.CollectiveId, { paranoid: false });
     const transaction = await hostFeeTransaction.getRelatedTransaction({ kind: ['CONTRIBUTION', 'ADDED_FUNDS'] });
     // TODO preload Payment method to define wether debts have ben created automatically
-    const result = await models.Transaction.createHostFeeShareTransactions(
-      { transaction, hostFeeTransaction },
-      host,
-      false,
-    );
+    const result = await models.Transaction.createHostFeeShareTransactions({ transaction, hostFeeTransaction });
 
     results.push(Boolean(result));
   }

scripts/ledger/split-host-fees.ts

@@ -42,7 +42,6 @@ const migrate = async () => {
   const groupedTransactions = Object.values(groupBy(transactions, 'TransactionGroup'));
   const timestamp = Date.now().toString();
   const transactionsData = { hostFeeMigration: timestamp };
-  const hostsCache = {};
   let count = 0;
 
   console.log(`Migrating ${groupedTransactions.length} transaction pairs...`);
@@ -64,18 +63,9 @@ const migrate = async () => {
       continue;
     }
 
-    // Caching hosts (small optimization)
-    let host;
-    if (credit.HostCollectiveId && hostsCache[credit.HostCollectiveId]) {
-      host = hostsCache[credit.HostCollectiveId];
-    } else {
-      host = await credit.getHostCollective();
-      hostsCache[host.id] = host;
-    }
-
     // Create host fee transaction
     const creditPreMigrationData = pick(credit.dataValues, BACKUP_COLUMNS);
-    const result = await models.Transaction.createHostFeeTransactions(credit, host, transactionsData);
+    const result = await models.Transaction.createHostFeeTransactions(credit, transactionsData);
     if (!result) {
       continue;
     }

scripts/ledger/update-transactions.ts

@@ -43,7 +43,7 @@ const MODIFIERS = {
         const host = accountsCache[transaction.HostCollectiveId] || (await transaction.getHostCollective());
         accountsCache[transaction.HostCollectiveId] = host;
         transaction.hostFeeInHostCurrency = transaction.amount * (percentage / 100);
-        await models.Transaction.createHostFeeTransactions(transaction, host);
+        await models.Transaction.createHostFeeTransactions(transaction);
       }
     },
   },

scripts/taxes/add-tax-on-expense.ts

@@ -6,6 +6,7 @@ import { Command } from 'commander';
 import { sum } from 'lodash';
 
 import models, { sequelize } from '../../server/models';
+import { ExpenseTaxDefinition } from '../../server/models/Expense';
 
 const program = new Command()
   .description('Helper to add a tax on an existing expense')
@@ -44,7 +45,7 @@ const main = async () => {
     }
   }
 
-  const tax = { type: 'GST', id: 'GST', rate: 0.15, percentage: 15 };
+  const tax = { type: 'GST', id: 'GST', rate: 0.15, percentage: 15 } as ExpenseTaxDefinition;
   const taxAmountFromExpense = getTaxAmount(expense.amount, tax.rate);
   const taxAmountFromItems = sum(expense.items.map(i => getTaxAmount(i.amount, tax.rate)));
   if (taxAmountFromExpense !== taxAmountFromItems) {

server/constants/paymentMethods.ts

@@ -9,6 +9,7 @@ export enum PAYMENT_METHOD_SERVICE {
 export const PAYMENT_METHOD_SERVICES = Object.values(PAYMENT_METHOD_SERVICE);
 
 export enum PAYMENT_METHOD_TYPE {
+  DEFAULT = 'default',
   ALIPAY = 'alipay',
   CREDITCARD = 'creditcard',
   PREPAID = 'prepaid',

server/graphql/common/expenses.ts

@@ -63,7 +63,7 @@ import { canUseFeature } from '../../lib/user-permissions';
 import { formatCurrency, parseToBoolean } from '../../lib/utils';
 import models, { Collective, sequelize } from '../../models';
 import AccountingCategory from '../../models/AccountingCategory';
-import Expense, { ExpenseDataValuesByRole, ExpenseStatus } from '../../models/Expense';
+import Expense, { ExpenseDataValuesByRole, ExpenseStatus, ExpenseTaxDefinition } from '../../models/Expense';
 import ExpenseAttachedFile from '../../models/ExpenseAttachedFile';
 import ExpenseItem from '../../models/ExpenseItem';
 import LegalDocument, { LEGAL_DOCUMENT_TYPE } from '../../models/LegalDocument';
@@ -1141,12 +1141,6 @@ export const hasMultiCurrency = (collective, host): boolean => {
   return collective.currency === host?.currency; // Only support multi-currency when collective/host have the same currency
 };
 
-type TaxDefinition = {
-  type: string;
-  rate: number;
-  idNumber: string;
-};
-
 type ExpenseData = {
   id?: number;
   payoutMethod?: Record<string, unknown>;
@@ -1164,7 +1158,7 @@ type ExpenseData = {
   longDescription?: string;
   amount?: number;
   currency?: SupportedCurrency;
-  tax?: TaxDefinition[];
+  tax?: ExpenseTaxDefinition[];
   customData: Record<string, unknown>;
   accountingCategory?: AccountingCategory;
 };
@@ -1934,7 +1928,7 @@ export async function editExpense(req: express.Request, expenseData: ExpenseData
   const updatedItemsData: Partial<ExpenseItem>[] =
     (await prepareExpenseItemInputs(expenseCurrency, expenseData.items, { isEditing: true })) || expense.items;
   const [hasItemChanges, itemsDiff] = await getItemsChanges(expense.items, updatedItemsData);
-  const taxes = expenseData.tax || (expense.data?.taxes as TaxDefinition[]) || [];
+  const taxes = expenseData.tax || (expense.data?.taxes as ExpenseTaxDefinition[]) || [];
   checkTaxes(expense.collective, expense.collective.host, expenseType, taxes);
 
   if (!options?.['skipPermissionCheck'] && !(await canEditExpense(req, expense))) {

server/graphql/v1/mutations/orders.js

@@ -436,7 +436,7 @@ export async function createOrder(order, req) {
       orderPublicData = pick(order.data, []);
     }
 
-    const platformTipEligible = await libPayments.isPlatformTipEligible({ ...order, collective }, host);
+    const platformTipEligible = await libPayments.isPlatformTipEligible({ ...order, collective });
 
     const orderData = {
       CreatedByUserId: remoteUser.id,

server/graphql/v1/types.js

@@ -1487,7 +1487,7 @@ export const OrderType = new GraphQLObjectType({
         type: GraphQLJSON,
         description: 'Additional information on order: tax and custom fields',
         resolve(order) {
-          return pick(order.data, ['tax', 'customData', 'isFeesOnTop', 'platformFee', 'hasPlatformTip', 'platformTip']);
+          return pick(order.data, ['tax', 'customData', 'platformFee', 'hasPlatformTip', 'platformTip']);
         },
       },
       stripeError: {

server/lib/budget.js

@@ -481,7 +481,7 @@ export async function getSumCollectivesAmountReceived(
 
 export async function getTotalMoneyManagedAmount(
   host,
-  { endDate, collectiveIds, currency, version, loaders = null } = {},
+  { endDate, collectiveIds, currency, version = null, loaders = null } = {},
 ) {
   version = version || host.settings?.budget?.version || DEFAULT_BUDGET_VERSION;
   currency = currency || host.currency;