Merge pull request #26 from jattento/feature/bitmap-default-length

if no length is indicated for a bitmap, 64 is assumed

Author: jattento

README.md

@@ -1,5 +1,8 @@
 [![codecov](https://codecov.io/gh/jattento/go-iso8583/branch/master/graph/badge.svg)](https://codecov.io/gh/jattento/go-iso8583)
 [![Maintainability](https://api.codeclimate.com/v1/badges/94a2058a2b0823cf31be/maintainability)](https://codeclimate.com/github/jattento/go-iso8583/maintainability)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Last release](https://img.shields.io/github/v/release/jattento/go-iso8583?style=plastic)](https://github.com/jattento/go-iso8583/releases)
+
 
 | Version   |      Build      |
 |----------|:-------------:|
@@ -43,8 +46,8 @@ import "github.com/jattento/go-iso8583/pkg/iso8583"
 
 type exampleMessage struct {
 	MessageTypeIdentifier                     iso8583.MTI       `iso8583:"mti,length:4,encoding:ebcdic"`
-	Bitmap                                    iso8583.BITMAP    `iso8583:"bitmap,length:64"`
-	SecondaryBitmap                           iso8583.BITMAP    `iso8583:"1,length:64,encoding:ebcdic,omitempty"`
+	Bitmap                                    iso8583.BITMAP    `iso8583:"bitmap"`
+	SecondaryBitmap                           iso8583.BITMAP    `iso8583:"1,omitempty"`
 	PrimaryAccountNumber                      iso8583.LLVAR     `iso8583:"2,length:64,encoding:ebcdic,omitempty"`
 	ProcessingCode                            iso8583.VAR       `iso8583:"3,length:6,encoding:ebcdic,omitempty"` 
 	AmountTransaction                         iso8583.VAR       `iso8583:"4,length:12,encoding:ebcdic,omitempty"`
@@ -67,6 +70,7 @@ type exampleMessage struct {
 	SecurityRelatedControlInformation         iso8583.VAR       `iso8583:"53,length:16,encoding:ebcdic,omitempty"`
 	AdditionalAmounts                         iso8583.LLLVAR    `iso8583:"54,length:120,encoding:ebcdic,omitempty"`
 	IntegratedCircuitCardSystemRelatedData    iso8583.LLLBINARY `iso8583:"55,length:999,encoding:ebcdic,omitempty"`
+    MessageSecurityCode                       iso8583.VAR       `iso8583:"96,length:8,encoding:ebcdic,omitempty"`
 }
 ```
 

pkg/iso8583/decode.go

@@ -232,6 +232,11 @@ func unmarshalField(strct reflect.Value, fieldName string, bytes []byte) (int, t
 			"iso8583.unmarshal: field %s is present but does not implement Unmarshaler interface", fieldName)
 	}
 
+	// If bitmap length is not indicated: we assume its 64.
+	if _, isBitmap := fieldValue.Interface().(UnmarshalerBitmap); isBitmap && tag.Length == 0 {
+		tag.Length = 64
+	}
+
 	consumed, err := executeUnmarshal(fieldInterface, bytes, tag)
 
 	return consumed, tag, err

pkg/iso8583/decode_test.go

@@ -31,14 +31,14 @@ func TestUnmarshal(t *testing.T) {
 				[]byte("asd")...)...),
 			InputStruct: &struct {
 				Mti    iso8583.VAR    `iso8583:"mti,length:4"`
-				Bitmap iso8583.BITMAP `iso8583:"bitmap,length:64"`
+				Bitmap iso8583.BITMAP `iso8583:"bitmap"`
 				Field2 iso8583.VAR    `iso8583:"2,length:3"`
 				field3 iso8583.VAR    `iso8583:"3,length:3"`
 			}{},
 			ExpectedOutputError: "",
 			ExpectedOutputStruct: struct {
 				Mti    iso8583.VAR    `iso8583:"mti,length:4"`
-				Bitmap iso8583.BITMAP `iso8583:"bitmap,length:64"`
+				Bitmap iso8583.BITMAP `iso8583:"bitmap"`
 				Field2 iso8583.VAR    `iso8583:"2,length:3"`
 				field3 iso8583.VAR    `iso8583:"3,length:3"`
 			}{
@@ -62,15 +62,15 @@ func TestUnmarshal(t *testing.T) {
 				64: false}), bitmap.ToBytes(map[int]bool{1: false, 2: true, 64: false})...)...), []byte("asdfgh")...),
 			InputStruct: &struct {
 				Mti     iso8583.VAR    `iso8583:"mti,length:4"`
-				Bitmap  iso8583.BITMAP `iso8583:"bitmap,length:64"`
+				Bitmap  iso8583.BITMAP `iso8583:"bitmap"`
 				Field1  iso8583.BITMAP `iso8583:"1,length:64"`
 				Field2  iso8583.VAR    `iso8583:"2,length:3"`
 				Field66 iso8583.VAR    `iso8583:"66,length:3"`
 			}{},
 			ExpectedOutputError: "",
 			ExpectedOutputStruct: struct {
 				Mti     iso8583.VAR    `iso8583:"mti,length:4"`
-				Bitmap  iso8583.BITMAP `iso8583:"bitmap,length:64"`
+				Bitmap  iso8583.BITMAP `iso8583:"bitmap"`
 				Field1  iso8583.BITMAP `iso8583:"1,length:64"`
 				Field2  iso8583.VAR    `iso8583:"2,length:3"`
 				Field66 iso8583.VAR    `iso8583:"66,length:3"`
@@ -226,7 +226,7 @@ func TestUnmarshal(t *testing.T) {
 				[]byte("asd")...)...),
 			InputStruct: &struct {
 				MTI    VarMock        `iso8583:"mti,length:3"`
-				Bitmap iso8583.BITMAP `iso8583:"bitmap,length:64"`
+				Bitmap iso8583.BITMAP `iso8583:"bitmap"`
 			}{
 				MTI: VarMock{returnUnmarshal: 999},
 			},

pkg/iso8583/encode.go

@@ -261,10 +261,18 @@ func (m *marshalerMessage) resolveMarshalerBitmaps(fields *[]field) (bool, error
 
 	sortFieldsStable(m.Bitmaps, func(index int) string { return m.Bitmaps[index].Field })
 
+	// If bitmap length is not indicated: we assume its 64.
+	for n := 0; len(m.Bitmaps) > n; n++ {
+		if m.Bitmaps[n].tags.Length == 0 {
+			m.Bitmaps[n].tags.Length = 64
+		}
+	}
+
 	// Resolve all bitmaps starting from last one to first,
 	// this is because every bitmaps indicates the presence of the next one.
 	for n := len(m.Bitmaps) - 1; n >= 0; n-- {
 		// Marshal bitmap...
+
 		b, err := m.Bitmaps[n].MarshalerBitmap.MarshalISO8583Bitmap(m.createBitmapMarshalerInput(*fields, n), m.Bitmaps[n].tags.Encoding)
 		if err != nil {
 			return false, fmt.Errorf("iso8583.marshal: field %s cant be marshaled: %w", m.Bitmaps[n].tags.Field, err)

pkg/iso8583/encode_test.go

@@ -24,7 +24,7 @@ func TestMarshal(t *testing.T) {
 			Name: "simple_one_field_ebcdic",
 			Run:  true,
 			Input: struct {
-				Bitmap iso8583.BITMAP `iso8583:"bitmap,length:64"`
+				Bitmap iso8583.BITMAP `iso8583:"bitmap"`
 				Field1 iso8583.VAR    `iso8583:"mti,encoding:ebcdic"`
 				Field2 iso8583.VAR    `iso8583:"1"`
 			}{
@@ -233,7 +233,7 @@ func TestMarshal(t *testing.T) {
 			Input: struct {
 				Bitmap   iso8583.BITMAP `iso8583:"bitmap,length:64"`
 				MTI      iso8583.VAR    `iso8583:"mti"`
-				Field1   iso8583.BITMAP `iso8583:"1,length:64"`
+				Field1   iso8583.BITMAP `iso8583:"1"`
 				Field2   iso8583.VAR    `iso8583:"2"`
 				Field32  iso8583.VAR    `iso8583:"32"`
 				Field64  iso8583.VAR    `iso8583:"64"`

pkg/template/mastercard.go

@@ -7,8 +7,8 @@ import (
 // MasterCardISO87 is a template of the communication settings used for MasterCard connectivity on ISO8583 on 1987 version.
 type MasterCardISO87 struct {
 	MessageTypeIdentifier                     iso8583.MTI       `iso8583:"mti,length:4,encoding:ebcdic"`
-	Bitmap                                    iso8583.BITMAP    `iso8583:"bitmap,length:64"`
-	SecondaryBitmap                           iso8583.BITMAP    `iso8583:"1,length:64,encoding:ebcdic,omitempty"`
+	Bitmap                                    iso8583.BITMAP    `iso8583:"bitmap"`
+	SecondaryBitmap                           iso8583.BITMAP    `iso8583:"1,omitempty"`
 	PrimaryAccountNumber                      iso8583.LLVAR     `iso8583:"2,length:64,encoding:ebcdic,omitempty"`
 	ProcessingCode                            iso8583.VAR       `iso8583:"3,length:6,encoding:ebcdic,omitempty"`
 	AmountTransaction                         iso8583.VAR       `iso8583:"4,length:12,encoding:ebcdic,omitempty"`