[FAB-13151] Fill in Length fields in attachments

ReadDoc function misses out setting the Length field in the attachments in CouchDoc struct Change-Id: Ife6d4206cf428031ab00392dd90a34e4404325d9 Signed-off-by: ChanderG <mail@chandergovind.org>
hyperledger · Dec 4, 2018 · 28fd96e · 28fd96e
1 parent 4c7ffa3
commit 28fd96e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/core/ledger/util/couchdb/couchdb.go b/core/ledger/util/couchdb/couchdb.go
@@ -823,6 +823,7 @@ func (dbclient *CouchDatabase) ReadDoc(id string) (*CouchDoc, string, error) {
 
 						logger.Debugf("[%s] Retrieved attachment data", dbclient.DBName)
 						attachment.AttachmentBytes = respBody
+						attachment.Length = uint64(len(attachment.AttachmentBytes))
 						attachment.Name = p.FileName()
 						attachments = append(attachments, attachment)
 
@@ -835,6 +836,7 @@ func (dbclient *CouchDatabase) ReadDoc(id string) (*CouchDoc, string, error) {
 						}
 						logger.Debugf("[%s] Retrieved attachment data", dbclient.DBName)
 						attachment.AttachmentBytes = partdata
+						attachment.Length = uint64(len(attachment.AttachmentBytes))
 						attachment.Name = p.FileName()
 						attachments = append(attachments, attachment)
 

diff --git a/core/ledger/util/couchdb/couchdb_test.go b/core/ledger/util/couchdb/couchdb_test.go
@@ -742,6 +742,7 @@ func TestDBSaveAttachment(t *testing.T) {
 	attachment := &AttachmentInfo{}
 	attachment.AttachmentBytes = byteText
 	attachment.ContentType = "text/plain"
+	attachment.Length = uint64(len(byteText))
 	attachment.Name = "valueBytes"
 
 	attachments := []*AttachmentInfo{}
@@ -766,6 +767,7 @@ func TestDBSaveAttachment(t *testing.T) {
 	assert.NoError(t, geterr2, "Error when trying to retrieve a document with attachment")
 	assert.NotNil(t, couchDoc.Attachments)
 	assert.Equal(t, byteText, couchDoc.Attachments[0].AttachmentBytes)
+	assert.Equal(t, attachment.Length, couchDoc.Attachments[0].Length)
 
 }