Merge pull request #565 from bigcapitalhq/fix-edit-bank-rule

fix: Edit bank rule

packages/server/src/api/controllers/Banking/BankingRulesController.ts

@@ -34,8 +34,9 @@ export class BankingRulesController extends BaseController {
       body('conditions.*.comparator')
         .exists()
         .isIn(['equals', 'contains', 'not_contain'])
-        .default('contain'),
+        .default('contain')
-      body('conditions.*.value').exists(),
+        .trim(),
+      body('conditions.*.value').exists().trim(),
 
       // Assign
       body('assign_category').isString(),

packages/server/src/services/Banking/RegonizeTranasctions/GetAutofillCategorizeTransactionTransformer.ts

@@ -115,17 +115,19 @@ export class GetAutofillCategorizeTransctionTransformer extends Transformer {
   }
 
   /**
-   *
+   * Retrieves the assigned category of recognized transaction, if is not recognized
+   * returns the default transaction type depends on the transaction normal.
    * @returns {string}
    */
   public transactionType() {
-    const assignCategory =
+    const assignedCategory =
       this.options.firstUncategorizedTransaction?.recognizedTransaction
-        ?.assignCategory || null;
+        ?.assignedCategory;
 
-    return assignCategory || this.isDepositTransaction()
+    return (
-      ? 'other_income'
+      assignedCategory ||
-      : 'other_expense';
+      (this.isDepositTransaction() ? 'other_income' : 'other_expense')
+    );
   }
 
   /**

packages/server/src/services/Banking/RegonizeTranasctions/_utils.ts

@@ -1,3 +1,4 @@
+import { lowerCase } from 'lodash';
 import UncategorizedCashflowTransaction from '@/models/UncategorizedCashflowTransaction';
 import {
   BankRuleApplyIfTransactionType,
@@ -51,12 +52,15 @@ const matchNumberCondition = (
 const matchTextCondition = (
   transaction: UncategorizedCashflowTransaction,
   condition: IBankRuleCondition
-) => {
+): boolean => {
   switch (condition.comparator) {
     case BankRuleConditionComparator.Equals:
       return transaction[condition.field] === condition.value;
     case BankRuleConditionComparator.Contains:
-      return transaction[condition.field]?.includes(condition.value.toString());
+      const fieldValue = lowerCase(transaction[condition.field]);
+      const conditionValue = lowerCase(condition.value);
+
+      return fieldValue.includes(conditionValue);
     case BankRuleConditionComparator.NotContain:
       return !transaction[condition.field]?.includes(
         condition.value.toString()
@@ -101,4 +105,4 @@ const determineFieldType = (field: string): string => {
     default:
       return 'unknown';
   }
-};
+};

packages/server/src/services/Banking/Rules/EditBankRule.ts

@@ -64,9 +64,10 @@ export class EditBankRuleService {
         } as IBankRuleEventEditingPayload);
 
         // Updates the given bank rule.
-        await BankRule.query(trx)
+        await BankRule.query(trx).upsertGraphAndFetch({
-          .findById(ruleId)
+          ...tranformDTO,
-          .patch({ ...tranformDTO });
+          id: ruleId,
+        });
 
         // Triggers `onBankRuleEdited` event.
         await this.eventPublisher.emitAsync(events.bankRules.onEdited, {

packages/server/src/services/Banking/Rules/types.ts

@@ -16,7 +16,7 @@ export interface IBankRuleCondition {
   id?: number;
   field: BankRuleConditionField;
   comparator: BankRuleConditionComparator;
-  value: number;
+  value: string;
 }
 
 export enum BankRuleConditionType {

packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionBranchField.tsx

@@ -8,15 +8,15 @@ export function CategorizeTransactionBranchField() {
   const { branches } = useCategorizeTransactionBoot();
 
   return (
-    <FFormGroup name={'branchId'} label={'Branch'} fastField inline>
+    <FeatureCan feature={Features.Branches}>
-      <FeatureCan feature={Features.Branches}>
+      <FFormGroup name={'branchId'} label={'Branch'} fastField inline>
         <BranchSuggestField
           name={'branchId'}
           items={branches}
           popoverProps={{ minimal: true }}
           fill
         />
-      </FeatureCan>
+      </FFormGroup>
-    </FFormGroup>
+    </FeatureCan>
   );
 }