Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filter out extensionLists when extension element is an empty array #2

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mojaloop/central-object-store",
"version": "6.4.1-snapshot",
"version": "6.4.2-snapshot",
"description": "Mojaloop library for common object store",
"license": "Apache-2.0",
"author": "ModusBox",
Expand Down
6 changes: 6 additions & 0 deletions src/bulkTransfers/models/facade.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ const BulkTransferResultModelFactory = require('./bulkTransferResult')
const getBulkTransferResultByMessageIdDestination = async (messageId, destination) => {
let BulkTransferResultModel = BulkTransferResultModelFactory.getBulkTransferResultModel()
let message = await BulkTransferResultModel.findOne({ messageId, destination })
message.individualTransferResults = message.individualTransferResults.map(tr => {
if (!tr._doc.extensionList.extension.length) {
delete tr._doc.extensionList
}
return tr
})
return message.toJSON()
}

Expand Down
6 changes: 6 additions & 0 deletions src/bulkTransfers/schema/bulkTransfer.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ const getBulkTransferSchema = () => {
try {
this.individualTransfers.forEach(async transfer => {
try {
if (!transfer._doc.extensionList.extension.length) {
delete transfer._doc.extensionList
}
let individualTransfer = new IndividualTransferModel({
_id_bulkTransfers: this._id,
messageId: this.messageId,
Expand All @@ -84,6 +87,9 @@ const getBulkTransferSchema = () => {
throw e
}
})
if (!this.extensionList.extension.length) {
delete this._doc.extensionList
}
} catch (e) {
throw (e)
}
Expand Down
6 changes: 6 additions & 0 deletions src/bulkTransfers/schema/bulkTransferFulfil.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ const getBulkTransferFulfilSchema = () => {
try {
this.individualTransferResults.forEach(async transfer => {
try {
if (!transfer._doc.extensionList.extension.length) {
delete transfer._doc.extensionList
}
let individualTransferFulfil = new IndividualTransferFulfilModel({
_id_bulkTransferFulfils: this._id,
messageId: this.messageId,
Expand All @@ -77,6 +80,9 @@ const getBulkTransferFulfilSchema = () => {
throw e
}
})
if (!this.extensionList.extension.length) {
delete this._doc.extensionList
}
} catch (e) {
throw (e)
}
Expand Down
6 changes: 6 additions & 0 deletions src/bulkTransfers/schema/bulkTransferResult.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ const getBulkTransferResultSchema = () => {
try {
this.individualTransferResults.forEach(async transfer => {
try {
if (!transfer._doc.extensionList.extension.length) {
delete transfer._doc.extensionList
}
let individualTransferResult = new IndividualTransferResultModel({
_id_bulkTransferResults: this._id,
messageId: this.messageId,
Expand All @@ -81,6 +84,9 @@ const getBulkTransferResultSchema = () => {
throw e
}
})
if (!this.extensionList.extension.length) {
delete this._doc.extensionList
}
} catch (e) {
throw (e)
}
Expand Down
9 changes: 9 additions & 0 deletions src/bulkTransfers/schema/individualTransfer.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,15 @@ const getIndividualTransferSchema = () => {
payload: { type: Object, required: true }
}))
}
IndividualTransferSchema.pre('save', function () {
try {
if (!this.payload.extensionList.extension.length) {
delete this._doc.payload.extensionList
}
} catch (e) {
throw (e)
}
})
return IndividualTransferSchema
}

Expand Down
9 changes: 9 additions & 0 deletions src/bulkTransfers/schema/individualTransferFulfil.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@ const getIndividualTransferFulfilSchema = () => {
payload: { type: Object, required: true }
}))
}
IndividualTransferFulfilSchema.pre('save', function () {
try {
if (!this.payload.extensionList.extension.length) {
delete this._doc.payload.extensionList
}
} catch (e) {
throw (e)
}
})
return IndividualTransferFulfilSchema
}

Expand Down
9 changes: 9 additions & 0 deletions src/bulkTransfers/schema/individualTransferResult.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ const getIndividualTransferResultSchema = () => {
}))
IndividualTransferResultSchema.index({ messageId: 1, destination: 1 })
}
IndividualTransferResultSchema.pre('save', function () {
try {
if (!this.payload.extensionList.extension.length) {
delete this._doc.payload.extensionList
}
} catch (e) {
throw (e)
}
})
return IndividualTransferResultSchema
}

Expand Down