From ea39eb17a7194e74f9330f5642859c1f61b37fb3 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@live.com>
Date: Sun, 29 Nov 2020 12:43:37 +0200
Subject: [PATCH] fix: converting API body attributes empty strings to null.

---
 .../Accounting/MakeJournalEntriesForm.js      |  9 +---
 .../MakeJournalEntriesForm.schema.js          | 41 -------------------
 .../MakeJournalFormFloatingActions.js         |  4 ++
 server/package.json                           |  2 +
 .../middleware/ConvertEmptyStringsToNull.ts   |  7 +++-
 server/src/utils/index.js                     | 36 ++++++++--------
 6 files changed, 34 insertions(+), 65 deletions(-)
 delete mode 100644 client/src/containers/Accounting/MakeJournalEntriesForm.schema.js

diff --git a/client/src/containers/Accounting/MakeJournalEntriesForm.js b/client/src/containers/Accounting/MakeJournalEntriesForm.js
index 3f49897fc..b03b2bb03 100644
--- a/client/src/containers/Accounting/MakeJournalEntriesForm.js
+++ b/client/src/containers/Accounting/MakeJournalEntriesForm.js
@@ -17,11 +17,6 @@ import MakeJournalEntriesField from './MakeJournalEntriesField';
 import MakeJournalNumberWatcher from './MakeJournalNumberWatcher';
 import MakeJournalFormFooter from './MakeJournalFormFooter';
 
-import {
-  CreateMakeJournalFormSchema,
-  EditMakeJournalFormSchema,
-} from './MakeJournalEntriesForm.schema';
-
 import withJournalsActions from 'containers/Accounting/withJournalsActions';
 import withManualJournalDetail from 'containers/Accounting/withManualJournalDetail';
 import withAccountsActions from 'containers/Accounts/withAccountsActions';
@@ -201,11 +196,11 @@ function MakeJournalEntriesForm({
     };
 
     if (isNewMode) {
+      requestMakeJournalEntries(form).then(handleSuccess).catch(handleError);
+    } else {
       requestEditManualJournal(manualJournal.id, form)
         .then(handleSuccess)
         .catch(handleError);
-    } else {
-      requestMakeJournalEntries(form).then(handleSuccess).catch(handleError);
     }
   };
   return (
diff --git a/client/src/containers/Accounting/MakeJournalEntriesForm.schema.js b/client/src/containers/Accounting/MakeJournalEntriesForm.schema.js
deleted file mode 100644
index 546c899b5..000000000
--- a/client/src/containers/Accounting/MakeJournalEntriesForm.schema.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import * as Yup from 'yup';
-import { formatMessage } from 'services/intl';
-import { DATATYPES_LENGTH } from 'common/dataTypes';
-
-const Schema = Yup.object().shape({
-  journal_number: Yup.string()
-    // .required()
-    .min(1)
-    .max(DATATYPES_LENGTH.STRING)
-    .label(formatMessage({ id: 'journal_number_' })),
-  journal_type: Yup.string()
-    .required()
-    .min(1)
-    .max(DATATYPES_LENGTH.STRING)
-    .label(formatMessage({ id: 'journal_type' })),
-  date: Yup.date()
-    .required()
-    .label(formatMessage({ id: 'date' })),
-  currency_code: Yup.string().max(3),
-  reference: Yup.string().nullable().min(1).max(DATATYPES_LENGTH.STRING),
-  description: Yup.string().min(1).max(DATATYPES_LENGTH.STRING),
-  status: Yup.boolean(),
-  entries: Yup.array().of(
-    Yup.object().shape({
-      credit: Yup.number().decimalScale(13).nullable(),
-      debit: Yup.number().decimalScale(13).nullable(),
-      account_id: Yup.number()
-        .nullable()
-        .when(['credit', 'debit'], {
-          is: (credit, debit) => credit || debit,
-          then: Yup.number().required(),
-        }),
-      contact_id: Yup.number().nullable(),
-      contact_type: Yup.string().nullable(),
-      note: Yup.string().max(DATATYPES_LENGTH.TEXT).nullable(),
-    }),
-  ),
-});
-
-export const CreateMakeJournalFormSchema = Schema;
-export const EditMakeJournalFormSchema = Schema;
diff --git a/client/src/containers/Accounting/MakeJournalFormFloatingActions.js b/client/src/containers/Accounting/MakeJournalFormFloatingActions.js
index c067dd75b..2e6f1c20d 100644
--- a/client/src/containers/Accounting/MakeJournalFormFloatingActions.js
+++ b/client/src/containers/Accounting/MakeJournalFormFloatingActions.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Intent, Button } from '@blueprintjs/core';
+import { useFormikContext } from 'formik';
 import classNames from 'classnames';
 import { FormattedMessage as T } from 'react-intl';
 import { saveInvoke } from 'utils';
@@ -11,6 +12,8 @@ export default function MakeJournalFloatingAction({
   onCancelClick,
   manualJournalId,
 }) {
+  const { submitForm } = useFormikContext();
+
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
       <Button
@@ -18,6 +21,7 @@ export default function MakeJournalFloatingAction({
         intent={Intent.PRIMARY}
         name={'save'}
         onClick={() => {
+          submitForm();
           saveInvoke(onSubmitClick, { publish: true, redirect: true });
         }}
       >
diff --git a/server/package.json b/server/package.json
index 538bf2aaf..979dd4dc5 100644
--- a/server/package.json
+++ b/server/package.json
@@ -29,8 +29,10 @@
     "compression": "^1.7.4",
     "crypto-random-string": "^3.2.0",
     "csurf": "^1.10.0",
+    "deep-map": "^2.0.0",
     "dotenv": "^8.1.0",
     "errorhandler": "^1.5.1",
+    "es6-weak-map": "^2.0.3",
     "esm": "^3.2.25",
     "event-dispatch": "^0.4.1",
     "express": "^4.17.1",
diff --git a/server/src/api/middleware/ConvertEmptyStringsToNull.ts b/server/src/api/middleware/ConvertEmptyStringsToNull.ts
index 5099f28ef..aa7b41690 100644
--- a/server/src/api/middleware/ConvertEmptyStringsToNull.ts
+++ b/server/src/api/middleware/ConvertEmptyStringsToNull.ts
@@ -1,5 +1,10 @@
 import { Request, Response, NextFunction } from 'express';
-import { convertEmptyStringsToNull } from 'utils';
+import deepMap from 'deep-map';
+import { convertEmptyStringToNull } from 'utils';
+
+function convertEmptyStringsToNull(data) {
+  return deepMap(data, (value) => convertEmptyStringToNull(value));
+}
 
 export default (req: Request, res: Response, next: NextFunction) => {  
   const transfomedBody = convertEmptyStringsToNull(req.body);
diff --git a/server/src/utils/index.js b/server/src/utils/index.js
index 8c068a17a..54fc9f72f 100644
--- a/server/src/utils/index.js
+++ b/server/src/utils/index.js
@@ -169,7 +169,7 @@ const getDefinedOptions = () => {
 };
 
 const getDefinedOption = (key, group) => {
-  return definedOptions?.[group]?.find(option => option.key == key);
+  return definedOptions?.[group]?.find((option) => option.key == key);
 };
 
 const isDefinedOptionConfigurable = (key, group) => {
@@ -179,30 +179,36 @@ const isDefinedOptionConfigurable = (key, group) => {
   return definedOption?.config || false;
 };
 
-const entriesAmountDiff = (newEntries, oldEntries, amountAttribute, idAttribute) => {
+const entriesAmountDiff = (
+  newEntries,
+  oldEntries,
+  amountAttribute,
+  idAttribute
+) => {
   const oldEntriesTable = _.chain(oldEntries)
     .groupBy(idAttribute)
-    .mapValues((group) => (_.sumBy(group, amountAttribute) || 0))
+    .mapValues((group) => _.sumBy(group, amountAttribute) || 0)
     .value();
 
   return _.chain(newEntries)
     .groupBy(idAttribute)
-    .mapValues((group) => (_.sumBy(group, amountAttribute) || 0))
+    .mapValues((group) => _.sumBy(group, amountAttribute) || 0)
     .mapValues((value, key) => value - (oldEntriesTable[key] || 0))
-    .mapValues((value, key) => ({ [idAttribute]: key, [amountAttribute]: value }))
+    .mapValues((value, key) => ({
+      [idAttribute]: key,
+      [amountAttribute]: value,
+    }))
     .filter((entry) => entry[amountAttribute] != 0)
     .values()
     .value();
 };
 
-const convertEmptyStringsToNull = (obj) => {
-  return _.mapValues(obj, (value, key) => {
-    return typeof value === 'string' ? 
-      value.trim() === '' ?
-      null :
-      value :
-      value;
-  });
+const convertEmptyStringToNull = (value) => {
+  return typeof value === 'string'
+    ? value.trim() === ''
+      ? null
+      : value
+    : value;
 };
 
 export {
@@ -218,11 +224,9 @@ export {
   getTotalDeep,
   applyMixins,
   formatDateFields,
-
   isDefinedOptionConfigurable,
   getDefinedOption,
   getDefinedOptions,
-
   entriesAmountDiff,
-  convertEmptyStringsToNull,
+  convertEmptyStringToNull,
 };