Merge pull request #143 from loukotal/fix/j1-j2-generation-code

Fix J1 & J2 validation for missing/empty generationCode

Author: adamdecaf

pkg/lib/j1_segment.go

@@ -159,7 +159,7 @@ func (s *J1Segment) Length() int {
 func (s *J1Segment) ValidateGenerationCode() error {
 	switch s.GenerationCode {
 	case GenerationCodeJunior, GenerationCodeSenior, GenerationCode2, GenerationCode3, GenerationCode4,
-		GenerationCode5, GenerationCode6, GenerationCode7, GenerationCode8, GenerationCode9:
+		GenerationCode5, GenerationCode6, GenerationCode7, GenerationCode8, GenerationCode9, "":
 		return nil
 	}
 	return utils.NewErrInvalidValueOfField("generation code", "j1 segment")

pkg/lib/j1_segment_test.go

@@ -6,6 +6,8 @@ package lib
 
 import (
 	"bytes"
+	"encoding/json"
+
 	"gopkg.in/check.v1"
 )
 
@@ -26,6 +28,26 @@ func (t *SegmentTest) TestJ1SegmentWithInvalidData(c *check.C) {
 	c.Assert(err, check.Not(check.IsNil))
 }
 
+func (t *SegmentTest) TestJ1SegmentWithEmptyGenerationCode(c *check.C) {
+	jsonStr := `{
+      "segmentIdentifier": "J1",
+      "surname": "BEAUCHAMP",
+      "firstName": "KEVIN",
+      "socialSecurityNumber": 445112877,
+      "dateBirth": "2020-01-02T00:00:00Z",
+      "telephoneNumber": 4335552333,
+      "ecoaCode": "2",
+      "consumerInformationIndicator": "R"
+    }`
+	segment := NewJ1Segment()
+	err := json.Unmarshal([]byte(jsonStr), &segment)
+	c.Assert(err, check.IsNil)
+	err = segment.Validate()
+	c.Assert(err, check.IsNil)
+	c.Assert(segment.Name(), check.Equals, J1SegmentName)
+	c.Assert(segment.Length(), check.Equals, J1SegmentLength)
+}
+
 func (t *SegmentTest) TestJ1SegmentWithInvalidGenerationCode(c *check.C) {
 	segment := J1Segment{}
 	_, err := segment.Parse(t.sampleJ1Segment)

pkg/lib/j2_segment.go

@@ -215,10 +215,10 @@ func (s *J2Segment) Length() int {
 func (s *J2Segment) ValidateGenerationCode() error {
 	switch s.GenerationCode {
 	case GenerationCodeJunior, GenerationCodeSenior, GenerationCode2, GenerationCode3, GenerationCode4,
-		GenerationCode5, GenerationCode6, GenerationCode7, GenerationCode8, GenerationCode9:
+		GenerationCode5, GenerationCode6, GenerationCode7, GenerationCode8, GenerationCode9, "":
 		return nil
 	}
-	return utils.NewErrInvalidValueOfField("generation code", "j1 segment")
+	return utils.NewErrInvalidValueOfField("generation code", "j2 segment")
 }
 
 // validation of telephone number

pkg/lib/j2_segment_test.go

@@ -6,6 +6,8 @@ package lib
 
 import (
 	"bytes"
+	"encoding/json"
+
 	"gopkg.in/check.v1"
 )
 
@@ -33,7 +35,35 @@ func (t *SegmentTest) TestJ2SegmentWithInvalidGenerationCode(c *check.C) {
 	segment.GenerationCode = "0"
 	err = segment.Validate()
 	c.Assert(err, check.Not(check.IsNil))
-	c.Assert(err.Error(), check.DeepEquals, "generation code in j1 segment has an invalid value")
+	c.Assert(err.Error(), check.DeepEquals, "generation code in j2 segment has an invalid value")
+}
+
+func (t *SegmentTest) TestJ2SegmentWithEmptyGenerationCode(c *check.C) {
+	jsonStr := `{
+      "segmentIdentifier": "J2",
+      "surname": "BEAUCHAMP",
+      "firstName": "KEVIN",
+      "socialSecurityNumber": 445112877,
+      "dateBirth": "2020-01-02T00:00:00Z",
+      "telephoneNumber": 4335552333,
+      "ecoaCode": "2",
+      "consumerInformationIndicator": "R",
+      "countryCode": "US",
+      "firstLineAddress": "234 HARRISON PLACE",
+      "secondLineAddress": "SUITE #305",
+      "city": "LANSING",
+      "state": "MI",
+      "zipCode": "72654",
+      "addressIndicator": "Y",
+      "residenceCode": "O"
+    }`
+	segment := NewJ2Segment()
+	err := json.Unmarshal([]byte(jsonStr), &segment)
+	c.Assert(err, check.IsNil)
+	err = segment.Validate()
+	c.Assert(err, check.IsNil)
+	c.Assert(segment.Name(), check.Equals, J2SegmentName)
+	c.Assert(segment.Length(), check.Equals, J2SegmentLength)
 }
 
 func (t *SegmentTest) TestJ2SegmentWithInvalidTelephoneNumber(c *check.C) {