Merge pull request #43 from adamdecaf/banktime

transfers: use banktime logic to compute EffectiveEntryDate

Author: adamdecaf

go.mod

@@ -5,8 +5,9 @@ require (
 	github.com/gorilla/mux v1.6.2
 	github.com/mattn/go-sqlite3 v1.10.0
 	github.com/moov-io/ach v0.6.0-rc5
-	github.com/moov-io/base v0.1.0
+	github.com/moov-io/base v0.2.0
 	github.com/prometheus/client_golang v0.9.2
 	github.com/prometheus/common v0.0.0-20181218105931-67670fe90761 // indirect
+	github.com/rickar/cal v1.0.0 // indirect
 	golang.org/x/text v0.3.0
 )

go.sum

@@ -24,20 +24,20 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0j
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/moov-io/ach v0.6.0-rc5 h1:PZPDIfqAMXoR1OaTgU7o7ZCnrWmnmLBdkFk7NgzQIFs=
 github.com/moov-io/ach v0.6.0-rc5/go.mod h1:zNN3kj7a+wXk9/CC3HwRJC9WYRfjuunsqAwA6ZY6n70=
-github.com/moov-io/base v0.0.0-20181217173006-ce7dce20b1c3 h1:gq3Dks/Zsyrz7ABI/E2CEQjQb+X4/iWi9c7RYM+ZNFk=
 github.com/moov-io/base v0.0.0-20181217173006-ce7dce20b1c3/go.mod h1:pPu/TAc9PkaaegbREVEeDHsGqyAlvji9vqTuARuAnd0=
-github.com/moov-io/base v0.1.0 h1:tPbZdF4qIfKQz9J/O9wXOx3+HYmPxBzm3+GACXsrGRY=
-github.com/moov-io/base v0.1.0/go.mod h1:pPu/TAc9PkaaegbREVEeDHsGqyAlvji9vqTuARuAnd0=
+github.com/moov-io/base v0.2.0 h1:4o0jBbVqkzQihR/Tx7LDLy+ME/6wBRHpa7TRKneqxNg=
+github.com/moov-io/base v0.2.0/go.mod h1:pPu/TAc9PkaaegbREVEeDHsGqyAlvji9vqTuARuAnd0=
 github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181218105931-67670fe90761 h1:z6tvbDJ5OLJ48FFmnksv04a78maSTRBUIhkdHYV5Y98=
 github.com/prometheus/common v0.0.0-20181218105931-67670fe90761/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/rickar/cal v1.0.0 h1:kb1QBxUDVz433Pw+NB4o6auW75d7HdsaD5ZsdnPdV/E=
+github.com/rickar/cal v1.0.0/go.mod h1:3GBx8OBrvh4/y/JTxM0e1bUUIHMnqILl1rMANHWExxQ=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

testdata/ppd-valid.json

@@ -5,7 +5,7 @@
         "immediateDestination": "231380104",
         "immediateOrigin": "121042882",
         "fileCreationDate": "2018-10-08T00:00:00Z",
-        "fileCreationTime": "0000-01-01T00:00:00Z",
+        "fileCreationTime": "2018-10-08T01:01:02Z",
         "fileIDModifier": "A",
         "immediateDestinationName": "Citadel",
         "immediateOriginName": "Wells Fargo"
@@ -34,34 +34,14 @@
                     "identificationNumber": "#83738AB#      ",
                     "individualName": "Steven Tander         ",
                     "discretionaryData": "  ",
-                    "addendaRecordIndicator": 1,
+                    "addendaRecordIndicator": 0,
                     "traceNumber": "121042880000001",
                     "category": "Forward"
                 }
-            ],
-            "batchControl": {
-                "id": "fileId",
-                "serviceClassCode": 200,
-                "entryAddendaÇount": 2,
-                "entryHash": 23138010,
-                "totalDebit": 0,
-                "totalCredit": 100000,
-                "companyIdentification": "121042882",
-                "ODFIIdentification": "12104288",
-                "batchNumber": 1
-            }
+            ]
         }
     ],
     "IATBatches": null,
-    "fileControl": {
-        "id": "fileId",
-        "batchCount": 1,
-        "blockCount": 1,
-        "entryAddendaCount": 2,
-        "entryHash": 23138010,
-        "totalDebit": 0,
-        "totalCredit": 100000
-    },
     "NotificationOfChange": null,
     "ReturnEntries": null
 }

transfers.go

@@ -747,7 +747,7 @@ func createACHFile(client *achclient.ACH, id, idempotencyKey, userId string, tra
 	batchHeader.StandardEntryClassCode = transfer.StandardEntryClassCode
 	batchHeader.CompanyIdentification = "121042882" // 9 digit FEIN number
 	batchHeader.CompanyEntryDescription = transfer.Description
-	batchHeader.EffectiveEntryDate = base.NewTime(time.Now()) // TODO(adam): set for tomorow?
+	batchHeader.EffectiveEntryDate = base.Now().AddBankingDay(1) // Date to be posted
 	batchHeader.ODFIIdentification = orig.Identification
 
 	// Add EntryDetail to PPD batch