From 1484bc6e673426b714eee8db1b8cee0170ac87cf Mon Sep 17 00:00:00 2001
From: Raam Chauhan <Raam.Chauhan@softwire.com>
Date: Thu, 9 Nov 2017 15:51:17 +0000
Subject: [PATCH] Added parseTransactions() module

---
 .idea/workspace.xml  | 56 ++++++++++++++++++++++++++------------------
 index.js             | 34 +--------------------------
 parseTransactions.js | 42 +++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 56 deletions(-)
 create mode 100644 parseTransactions.js

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 610cce9..5bf555f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="39ebc23b-c248-41a9-9993-3091849bbe12" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/createAccounts.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/parseTransactions.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.js" afterPath="$PROJECT_DIR$/index.js" />
     </list>
@@ -18,8 +18,18 @@
       <file leaf-file-name="index.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="153">
-              <caret line="9" column="48" lean-forward="false" selection-start-line="9" selection-start-column="48" selection-end-line="9" selection-end-column="48" />
+            <state relative-caret-position="102">
+              <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="50" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="parseTransactions.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/parseTransactions.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="34">
+              <caret line="2" column="50" lean-forward="false" selection-start-line="2" selection-start-column="50" selection-end-line="2" selection-end-column="50" />
               <folding />
             </state>
           </provider>
@@ -94,10 +104,10 @@
         <option value="$PROJECT_DIR$/accountClass.js" />
         <option value="$PROJECT_DIR$/currencyFormatter.js" />
         <option value="$PROJECT_DIR$/transactionClass.js" />
-        <option value="$PROJECT_DIR$/parseTransactions.js" />
         <option value="$PROJECT_DIR$/accountExistsQ.js" />
-        <option value="$PROJECT_DIR$/index.js" />
         <option value="$PROJECT_DIR$/createAccounts.js" />
+        <option value="$PROJECT_DIR$/index.js" />
+        <option value="$PROJECT_DIR$/parseTransactions.js" />
       </list>
     </option>
   </component>
@@ -273,12 +283,12 @@
       <option name="presentableId" value="Default" />
       <updated>1510136343530</updated>
       <workItem from="1510136344780" duration="22141000" />
-      <workItem from="1510219280573" duration="15595000" />
+      <workItem from="1510219280573" duration="15997000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="37736000" />
+    <option name="totallyTimeSpent" value="38138000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="0" width="1132" height="1167" extended-state="0" />
@@ -366,10 +376,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/parseTransactions.js">
+    <entry file="file://$PROJECT_DIR$/createAccounts.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17">
+          <caret line="1" column="48" lean-forward="false" selection-start-line="1" selection-start-column="48" selection-end-line="1" selection-end-column="48" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/transactionClass.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="37" selection-end-column="1" />
+        <state relative-caret-position="204">
+          <caret line="12" column="20" lean-forward="false" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
           <folding />
         </state>
       </provider>
@@ -390,26 +408,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/createAccounts.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="48" lean-forward="false" selection-start-line="1" selection-start-column="48" selection-end-line="1" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/transactionClass.js">
+    <entry file="file://$PROJECT_DIR$/parseTransactions.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="20" lean-forward="false" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
+        <state relative-caret-position="34">
+          <caret line="2" column="50" lean-forward="false" selection-start-line="2" selection-start-column="50" selection-end-line="2" selection-end-column="50" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="48" lean-forward="false" selection-start-line="9" selection-start-column="48" selection-end-line="9" selection-end-column="48" />
+        <state relative-caret-position="102">
+          <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="50" />
           <folding />
         </state>
       </provider>
diff --git a/index.js b/index.js
index 667d30e..530d787 100644
--- a/index.js
+++ b/index.js
@@ -8,6 +8,7 @@ const Transaction = require('./transactionClass');
 
 const accountExistsQ = require('./accountExistsQ');
 const createAccounts = require('./createAccounts');
+const parseTransactions = require('./parseTransactions');
 
 const formatter = new Intl.NumberFormat('en-UK', {
     style: 'currency',
@@ -20,40 +21,7 @@ log4js.configure({
     categories: {default: { appenders: ['file'], level: 'debug'}}
 });
 
-function parseTransactions(){
-    var keys = Object.keys(records[1]);
 
-    for(let i in records)
-    {
-        let lineValue = parseInt(i) + 2; // +1 for header row, +1 for zero base
-
-        if(!moment(records[i]['Date'],["DD/MM/YYYY","YYYY-MM-DD"],'en').isValid())
-        {
-            logger.error("Invalid date found in line " + lineValue +
-                " : " + records[i]['Date']);
-        }
-
-        else if (isNaN(parseFloat(records[i]['Amount'])))
-        {
-            logger.error("Invalid amount found in line " + lineValue
-                + " : " + records[i]['Amount'])
-        }
-        else
-        {
-            transaction = new Transaction(
-                records[i][keys[0]],
-                records[i][keys[1]],
-                records[i][keys[2]],
-                records[i][keys[3]],
-                records[i][keys[4]]);
-
-            transactions.push(transaction);
-            //transaction not added to list of transactions
-        }
-    }
-    logger.info("Successfully parsed " + transactions.length + " of " + records.length +
-        " transactions");
-}
 
 
 
diff --git a/parseTransactions.js b/parseTransactions.js
new file mode 100644
index 0000000..5630371
--- /dev/null
+++ b/parseTransactions.js
@@ -0,0 +1,42 @@
+const log4js = require('log4js');
+const moment = require('moment');
+const Transaction = require('./transactionClass');
+
+const logger = log4js.getLogger('parseTransactions.js');
+
+function parseTransactions(){
+    var keys = Object.keys(records[1]);
+
+    for(let i in records)
+    {
+        let lineValue = parseInt(i) + 2; // +1 for header row, +1 for zero base
+
+        if(!moment(records[i]['Date'],["DD/MM/YYYY","YYYY-MM-DD"],'en').isValid())
+        {
+            logger.error("Invalid date found in line " + lineValue +
+                " : " + records[i]['Date']);
+        }
+
+        else if (isNaN(parseFloat(records[i]['Amount'])))
+        {
+            logger.error("Invalid amount found in line " + lineValue
+                + " : " + records[i]['Amount'])
+        }
+        else
+        {
+            transaction = new Transaction(
+                records[i][keys[0]],
+                records[i][keys[1]],
+                records[i][keys[2]],
+                records[i][keys[3]],
+                records[i][keys[4]]);
+
+            transactions.push(transaction);
+            //transaction not added to list of transactions
+        }
+    }
+    logger.info("Successfully parsed " + transactions.length + " of " + records.length +
+        " transactions");
+}
+
+module.exports = parseTransactions;
\ No newline at end of file