FI mocks

FI mocks

fIBeneficiaryFIAdvice.go

@@ -20,8 +20,8 @@ type FIBeneficiaryFIAdvice struct {
 }
 
 // NewFIBeneficiaryFIAdvice returns a new FIBeneficiaryFIAdvice
-func NewFIBeneficiaryFIAdvice() FIBeneficiaryFIAdvice {
-	fibfia := FIBeneficiaryFIAdvice{
+func NewFIBeneficiaryFIAdvice() *FIBeneficiaryFIAdvice {
+	fibfia := &FIBeneficiaryFIAdvice{
 		tag: TagFIBeneficiaryFIAdvice,
 	}
 	return fibfia

fIBeneficiaryFIAdvice_test.go

@@ -0,0 +1,14 @@
+package wire
+
+//  mockFIBeneficiaryFIAdvice creates a FIBeneficiaryFIAdvice
+func mockFIBeneficiaryFIAdvice() *FIBeneficiaryFIAdvice {
+	fibfia := NewFIBeneficiaryFIAdvice()
+	fibfia.Advice.AdviceCode = AdviceCodeTelex
+	fibfia.Advice.LineOne = "Line One"
+	fibfia.Advice.LineTwo = "Line Two"
+	fibfia.Advice.LineThree = "Line Three"
+	fibfia.Advice.LineFour = "Line Four"
+	fibfia.Advice.LineFive = "Line Five"
+	fibfia.Advice.LineSix = "Line Six"
+	return fibfia
+}

fiAdditionalFIToFI.go

@@ -20,8 +20,8 @@ type FIAdditionalFIToFI struct {
 }
 
 // NewFIAdditionalFIToFI returns a new FIAdditionalFIToFI
-func NewFIAdditionalFIToFI() FIAdditionalFIToFI {
-	fifi := FIAdditionalFIToFI{
+func NewFIAdditionalFIToFI() *FIAdditionalFIToFI {
+	fifi := &FIAdditionalFIToFI{
 		tag: TagFIAdditionalFIToFI,
 	}
 	return fifi
@@ -47,6 +47,12 @@ func (fifi *FIAdditionalFIToFI) String() string {
 	// ToDo: Separator
 	buf.Grow(211)
 	buf.WriteString(fifi.tag)
+	buf.WriteString(fifi.LineOneField())
+	buf.WriteString(fifi.LineTwoField())
+	buf.WriteString(fifi.LineThreeField())
+	buf.WriteString(fifi.LineFourField())
+	buf.WriteString(fifi.LineFiveField())
+	buf.WriteString(fifi.LineSixField())
 	return buf.String()
 }
 
@@ -82,3 +88,35 @@ func (fifi *FIAdditionalFIToFI) Validate() error {
 func (fifi *FIAdditionalFIToFI) fieldInclusion() error {
 	return nil
 }
+
+// ToDo:  Add functions for writing
+
+// LineOneField gets a string of the LineOne field
+func (fifi *FIAdditionalFIToFI) LineOneField() string {
+	return fifi.alphaField(fifi.AdditionalFIToFI.LineOne, 35)
+}
+
+// LineTwoField gets a string of the LineTwo field
+func (fifi *FIAdditionalFIToFI) LineTwoField() string {
+	return fifi.alphaField(fifi.AdditionalFIToFI.LineTwo, 35)
+}
+
+// LineThreeField gets a string of the LineThree field
+func (fifi *FIAdditionalFIToFI) LineThreeField() string {
+	return fifi.alphaField(fifi.AdditionalFIToFI.LineThree, 35)
+}
+
+// LineFourField gets a string of the LineFour field
+func (fifi *FIAdditionalFIToFI) LineFourField() string {
+	return fifi.alphaField(fifi.AdditionalFIToFI.LineFour, 35)
+}
+
+// LineFiveField gets a string of the LineFive field
+func (fifi *FIAdditionalFIToFI) LineFiveField() string {
+	return fifi.alphaField(fifi.AdditionalFIToFI.LineFive, 35)
+}
+
+// LineSixField gets a string of the LineSix field
+func (fifi *FIAdditionalFIToFI) LineSixField() string {
+	return fifi.alphaField(fifi.AdditionalFIToFI.LineSix, 35)
+}

fiAdditionalFIToFI_test.go

@@ -0,0 +1,13 @@
+package wire
+
+//  mockFIAdditionalFIToFI creates a FIAdditionalFIToFI
+func mockFIAdditionalFIToFI() *FIAdditionalFIToFI {
+	fifi := NewFIAdditionalFIToFI()
+	fifi.AdditionalFIToFI.LineOne = "Line One"
+	fifi.AdditionalFIToFI.LineTwo = "Line Two"
+	fifi.AdditionalFIToFI.LineThree = "Line Three"
+	fifi.AdditionalFIToFI.LineFour = "Line Four"
+	fifi.AdditionalFIToFI.LineFive = "Line Five"
+	fifi.AdditionalFIToFI.LineSix = "Line Six"
+	return fifi
+}

fiBeneficiary.go

@@ -20,8 +20,8 @@ type FIBeneficiary struct {
 }
 
 // NewFIBeneficiary returns a new FIBeneficiary
-func NewFIBeneficiary() FIBeneficiary {
-	fib := FIBeneficiary{
+func NewFIBeneficiary() *FIBeneficiary {
+	fib := &FIBeneficiary{
 		tag: TagFIBeneficiary,
 	}
 	return fib
@@ -35,17 +35,17 @@ func (fib *FIBeneficiary) Parse(record string) {
 	fib.tag = record[:6]
 	fib.FIToFI.LineOne = fib.parseStringField(record[6:36])
 	fib.FIToFI.LineTwo = fib.parseStringField(record[36:69])
-	fib.FIToFI.LineThree = fib.parseStringField(record[69:104])
-	fib.FIToFI.LineFour = fib.parseStringField(record[104:139])
-	fib.FIToFI.LineFive = fib.parseStringField(record[139:174])
-	fib.FIToFI.LineSix = fib.parseStringField(record[174:209])
+	fib.FIToFI.LineThree = fib.parseStringField(record[69:102])
+	fib.FIToFI.LineFour = fib.parseStringField(record[102:135])
+	fib.FIToFI.LineFive = fib.parseStringField(record[135:168])
+	fib.FIToFI.LineSix = fib.parseStringField(record[168:201])
 }
 
 // String writes FIBeneficiary
 func (fib *FIBeneficiary) String() string {
 	var buf strings.Builder
 	// ToDo: Separator
-	buf.Grow(209)
+	buf.Grow(201)
 	buf.WriteString(fib.tag)
 	buf.WriteString(fib.LineOneField())
 	buf.WriteString(fib.LineTwoField())
@@ -91,30 +91,30 @@ func (fib *FIBeneficiary) fieldInclusion() error {
 
 // LineOneField gets a string of the LineOne field
 func (fib *FIBeneficiary) LineOneField() string {
-	return fib.alphaField(fib.FIToFI.LineOne, 35)
+	return fib.alphaField(fib.FIToFI.LineOne, 30)
 }
 
 // LineTwoField gets a string of the LineTwo field
 func (fib *FIBeneficiary) LineTwoField() string {
-	return fib.alphaField(fib.FIToFI.LineTwo, 35)
+	return fib.alphaField(fib.FIToFI.LineTwo, 33)
 }
 
 // LineThreeField gets a string of the LineThree field
 func (fib *FIBeneficiary) LineThreeField() string {
-	return fib.alphaField(fib.FIToFI.LineThree, 35)
+	return fib.alphaField(fib.FIToFI.LineThree, 33)
 }
 
 // LineFourField gets a string of the LineFour field
 func (fib *FIBeneficiary) LineFourField() string {
-	return fib.alphaField(fib.FIToFI.LineFour, 35)
+	return fib.alphaField(fib.FIToFI.LineFour, 33)
 }
 
 // LineFiveField gets a string of the LineFive field
 func (fib *FIBeneficiary) LineFiveField() string {
-	return fib.alphaField(fib.FIToFI.LineFive, 35)
+	return fib.alphaField(fib.FIToFI.LineFive, 33)
 }
 
 // LineSixField gets a string of the LineSix field
 func (fib *FIBeneficiary) LineSixField() string {
-	return fib.alphaField(fib.FIToFI.LineSix, 35)
+	return fib.alphaField(fib.FIToFI.LineSix, 33)
 }

fiBeneficiaryAdvice.go

@@ -20,8 +20,8 @@ type FIBeneficiaryAdvice struct {
 }
 
 // NewFIBeneficiaryAdvice returns a new FIBeneficiaryAdvice
-func NewFIBeneficiaryAdvice() FIBeneficiaryAdvice {
-	fiba := FIBeneficiaryAdvice{
+func NewFIBeneficiaryAdvice() *FIBeneficiaryAdvice {
+	fiba := &FIBeneficiaryAdvice{
 		tag: TagFIBeneficiaryAdvice,
 	}
 	return fiba

fiBeneficiaryAdvice_test.go

@@ -0,0 +1,14 @@
+package wire
+
+//  mockFIBeneficiaryAdvice creates a FIBeneficiaryAdvice
+func mockFIBeneficiaryAdvice() *FIBeneficiaryAdvice {
+	fiba := NewFIBeneficiaryAdvice()
+	fiba.Advice.AdviceCode = AdviceCodeLetter
+	fiba.Advice.LineOne = "Line One"
+	fiba.Advice.LineTwo = "Line Two"
+	fiba.Advice.LineThree = "Line Three"
+	fiba.Advice.LineFour = "Line Four"
+	fiba.Advice.LineFive = "Line Five"
+	fiba.Advice.LineSix = "Line Six"
+	return fiba
+}

fiBeneficiaryFI.go

@@ -20,8 +20,8 @@ type FIBeneficiaryFI struct {
 }
 
 // NewFIBeneficiaryFI returns a new FIBeneficiaryFI
-func NewFIBeneficiaryFI() FIBeneficiaryFI {
-	fibfi := FIBeneficiaryFI{
+func NewFIBeneficiaryFI() *FIBeneficiaryFI {
+	fibfi := &FIBeneficiaryFI{
 		tag: TagFIBeneficiaryFI,
 	}
 	return fibfi
@@ -32,26 +32,27 @@ func NewFIBeneficiaryFI() FIBeneficiaryFI {
 // Parse provides no guarantee about all fields being filled in. Callers should make a Validate() call to confirm
 // successful parsing and data validity.
 func (fibfi *FIBeneficiaryFI) Parse(record string) {
+	fibfi.tag = record[:6]
 	fibfi.FIToFI.LineOne = fibfi.parseStringField(record[6:36])
 	fibfi.FIToFI.LineTwo = fibfi.parseStringField(record[36:69])
-	fibfi.FIToFI.LineThree = fibfi.parseStringField(record[69:104])
-	fibfi.FIToFI.LineFour = fibfi.parseStringField(record[104:139])
-	fibfi.FIToFI.LineFive = fibfi.parseStringField(record[139:174])
-	fibfi.FIToFI.LineSix = fibfi.parseStringField(record[174:209])
+	fibfi.FIToFI.LineThree = fibfi.parseStringField(record[69:102])
+	fibfi.FIToFI.LineFour = fibfi.parseStringField(record[102:135])
+	fibfi.FIToFI.LineFive = fibfi.parseStringField(record[135:168])
+	fibfi.FIToFI.LineSix = fibfi.parseStringField(record[168:201])
 }
 
 // String writes FIBeneficiaryFI
 func (fibfi *FIBeneficiaryFI) String() string {
 	var buf strings.Builder
 	// ToDo: Separator
-	buf.Grow(209)
+	buf.Grow(201)
+	buf.WriteString(fibfi.tag)
 	buf.WriteString(fibfi.LineOneField())
 	buf.WriteString(fibfi.LineTwoField())
 	buf.WriteString(fibfi.LineThreeField())
 	buf.WriteString(fibfi.LineFourField())
 	buf.WriteString(fibfi.LineFiveField())
 	buf.WriteString(fibfi.LineSixField())
-	buf.WriteString(fibfi.tag)
 	return buf.String()
 }
 
@@ -90,30 +91,30 @@ func (fibfi *FIBeneficiaryFI) fieldInclusion() error {
 
 // LineOneField gets a string of the LineOne field
 func (fibfi *FIBeneficiaryFI) LineOneField() string {
-	return fibfi.alphaField(fibfi.FIToFI.LineOne, 35)
+	return fibfi.alphaField(fibfi.FIToFI.LineOne, 30)
 }
 
 // LineTwoField gets a string of the LineTwo field
 func (fibfi *FIBeneficiaryFI) LineTwoField() string {
-	return fibfi.alphaField(fibfi.FIToFI.LineTwo, 35)
+	return fibfi.alphaField(fibfi.FIToFI.LineTwo, 33)
 }
 
 // LineThreeField gets a string of the LineThree field
 func (fibfi *FIBeneficiaryFI) LineThreeField() string {
-	return fibfi.alphaField(fibfi.FIToFI.LineThree, 35)
+	return fibfi.alphaField(fibfi.FIToFI.LineThree, 33)
 }
 
 // LineFourField gets a string of the LineFour field
 func (fibfi *FIBeneficiaryFI) LineFourField() string {
-	return fibfi.alphaField(fibfi.FIToFI.LineFour, 35)
+	return fibfi.alphaField(fibfi.FIToFI.LineFour, 33)
 }
 
 // LineFiveField gets a string of the LineFive field
 func (fibfi *FIBeneficiaryFI) LineFiveField() string {
-	return fibfi.alphaField(fibfi.FIToFI.LineFive, 35)
+	return fibfi.alphaField(fibfi.FIToFI.LineFive, 33)
 }
 
 // LineSixField gets a string of the LineSix field
 func (fibfi *FIBeneficiaryFI) LineSixField() string {
-	return fibfi.alphaField(fibfi.FIToFI.LineSix, 35)
+	return fibfi.alphaField(fibfi.FIToFI.LineSix, 33)
 }

fiBeneficiaryFI_test.go

@@ -0,0 +1,13 @@
+package wire
+
+//  mockFIBeneficiaryFI creates a FIBeneficiaryFI
+func mockFIBeneficiaryFI() *FIBeneficiaryFI {
+	fibfi := NewFIBeneficiaryFI()
+	fibfi.FIToFI.LineOne = "Line One"
+	fibfi.FIToFI.LineTwo = "Line Two"
+	fibfi.FIToFI.LineThree = "Line Three"
+	fibfi.FIToFI.LineFour = "Line Four"
+	fibfi.FIToFI.LineFive = "Line Five"
+	fibfi.FIToFI.LineSix = "Line Six"
+	return fibfi
+}

fiBeneficiary_test.go

@@ -0,0 +1,13 @@
+package wire
+
+//  mockFIBeneficiary creates a FIBeneficiary
+func mockFIBeneficiary() *FIBeneficiary {
+	fib := NewFIBeneficiary()
+	fib.FIToFI.LineOne = "Line One"
+	fib.FIToFI.LineTwo = "Line Two"
+	fib.FIToFI.LineThree = "Line Three"
+	fib.FIToFI.LineFour = "Line Four"
+	fib.FIToFI.LineFive = "Line Five"
+	fib.FIToFI.LineSix = "Line Six"
+	return fib
+}

fiDrawdownDebitAccountAdvice.go

@@ -20,8 +20,8 @@ type FIDrawdownDebitAccountAdvice struct {
 }
 
 // NewFIDrawdownDebitAccountAdvice returns a new FIDrawdownDebitAccountAdvice
-func NewFIDrawdownDebitAccountAdvice() FIDrawdownDebitAccountAdvice {
-	debitDDAdvice := FIDrawdownDebitAccountAdvice{
+func NewFIDrawdownDebitAccountAdvice() *FIDrawdownDebitAccountAdvice {
+	debitDDAdvice := &FIDrawdownDebitAccountAdvice{
 		tag: TagFIDrawdownDebitAccountAdvice,
 	}
 	return debitDDAdvice

fiDrawdownDebitAccountAdvice_test.go

@@ -0,0 +1,14 @@
+package wire
+
+//  mockFIDrawdownDebitAccountAdvice creates a FIDrawdownDebitAccountAdvice
+func mockFIDrawdownDebitAccountAdvice() *FIDrawdownDebitAccountAdvice {
+	debitDDAdvice := NewFIDrawdownDebitAccountAdvice()
+	debitDDAdvice.Advice.AdviceCode = AdviceCodeLetter
+	debitDDAdvice.Advice.LineOne = "Line One"
+	debitDDAdvice.Advice.LineTwo = "Line Two"
+	debitDDAdvice.Advice.LineThree = "Line Three"
+	debitDDAdvice.Advice.LineFour = "Line Four"
+	debitDDAdvice.Advice.LineFive = "Line Five"
+	debitDDAdvice.Advice.LineSix = "Line Six"
+	return debitDDAdvice
+}