Skip to content

Commit

Permalink
Merge pull request #930 from Chia-Network/develop
Browse files Browse the repository at this point in the history
release: 1.6.12
MichaelTaylor3D authored Sep 29, 2023
2 parents 0dcef4a + ffa831b commit b8c7d3d
Showing 15 changed files with 497 additions and 318 deletions.
682 changes: 375 additions & 307 deletions package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cadt",
"version": "1.6.11",
"version": "1.6.12",
"_comment": "DONT CHANGE MAJOR UNLESS DATAMODEL CHANGES: The major version corresponds to the datamodel version your using, so 2.0.0 means it'll use datamodel v2",
"private": true,
"bin": "build/server.js",
@@ -58,24 +58,24 @@
"winston-daily-rotate-file": "^4.6.1"
},
"devDependencies": {
"@babel/cli": "^7.22.9",
"@babel/core": "^7.22.5",
"@babel/cli": "^7.22.15",
"@babel/core": "^7.22.19",
"@babel/plugin-syntax-import-attributes": "^7.22.5",
"@babel/preset-env": "^7.22.9",
"@babel/register": "^7.22.5",
"@commitlint/cli": "^17.6.6",
"@commitlint/config-conventional": "^17.6.6",
"@babel/preset-env": "^7.22.15",
"@babel/register": "^7.22.15",
"@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0",
"babel-plugin-module-resolver": "^5.0.0",
"chai": "^4.3.7",
"chai": "^4.3.8",
"chai-http": "^4.4.0",
"eslint": "^8.47.0",
"eslint": "^8.49.0",
"eslint-plugin-es": "^4.1.0",
"eslint-plugin-mocha": "^10.1.0",
"husky": "^8.0.3",

"mocha": "^10.2.0",
"semver": "^7.5.3",
"sinon": "^15.2.0",
"semver": "^7.5.4",
"sinon": "^16.0.0",
"socket.io-client": "^4.7.2",
"standard-version": "^9.5.0",
"supertest": "^6.3.3"
2 changes: 2 additions & 0 deletions src/controllers/audit.controller.js
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@ export const findAll = async (req, res) => {
res.status(400).json({
message: 'Can not retreive audit data',
error: error.message,
success: false,
});
}
};
@@ -33,6 +34,7 @@ export const findConflicts = async (req, res) => {
res.status(400).json({
message: 'Can not retreive audit data',
error: error.message,
success: false,
});
}
};
7 changes: 7 additions & 0 deletions src/controllers/fileStore.controller.js
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ export const subscribeToFileStore = (req, res) => {
res.status(400).json({
message: `Can not subscribe to file store.`,
error: error.message,
success: false,
});
}
};
@@ -31,6 +32,7 @@ export const unsubscribeFromFileStore = (req, res) => {
res.status(400).json({
message: 'Can not retrieve file list from filestore',
error: error.message,
success: false,
});
}
};
@@ -43,6 +45,7 @@ export const getFileList = async (req, res) => {
res.status(400).json({
message: 'Can not retrieve file list from filestore',
error: error.message,
success: false,
});
}
};
@@ -58,6 +61,7 @@ export const deleteFile = async (req, res) => {
res.status(400).json({
message: 'Can not delete file from filestore',
error: error.message,
success: false,
});
}
};
@@ -72,12 +76,14 @@ export const getFile = async (req, res) => {
} else {
res.status(400).json({
message: `FileId ${fileId} not found in the filestore.`,
success: false,
});
}
} catch (error) {
res.status(400).json({
message: 'Can not retreive file list from filestore',
error: error.message,
success: false,
});
}
};
@@ -112,6 +118,7 @@ export const addFileToFileStore = async (req, res) => {
res.status(400).json({
message: 'Can not add file to file store',
error: error.message,
success: false,
});
}
};
10 changes: 10 additions & 0 deletions src/controllers/governance.controller.js
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@ export const findAll = async (req, res) => {
res.status(400).json({
message: 'Can not retreive Governance Data',
error: error.message,
success: false,
});
}
};
@@ -46,6 +47,7 @@ export const isCreated = async (req, res) => {
res.status(400).json({
message: 'Can not retreive Governance Data',
error: error.message,
success: false,
});
}
};
@@ -58,6 +60,7 @@ export const findOrgList = async (req, res) => {
res.status(400).json({
message: 'Can not retreive Governance Data',
error: error.message,
success: false,
});
}
};
@@ -76,6 +79,7 @@ export const findGlossary = async (req, res) => {
res.status(400).json({
message: 'Can not retreive Governance Data',
error: error.message,
success: false,
});
}
};
@@ -95,6 +99,7 @@ export const findPickList = async (req, res) => {
res.status(400).json({
message: 'Can not retreive Governance Data',
error: error.message,
success: false,
});
}
};
@@ -116,6 +121,7 @@ export const createGoveranceBody = async (req, res) => {
res.status(400).json({
message: 'Cant create Governance Body',
error: error.message,
success: false,
});
}
};
@@ -141,6 +147,7 @@ export const setDefaultOrgList = async (req, res) => {
res.status(400).json({
message: 'Cant update default orgs',
error: error.message,
success: false,
});
}
};
@@ -165,6 +172,7 @@ export const setPickList = async (req, res) => {
res.status(400).json({
message: 'Cant update picklist',
error: error.message,
success: false,
});
}
};
@@ -188,6 +196,7 @@ export const setGlossary = async (req, res) => {
res.status(400).json({
message: 'Cant update glossary',
error: error.message,
success: false,
});
}
};
@@ -202,6 +211,7 @@ export const sync = async (req, res) => {
res.status(400).json({
message: 'Cant Sync Governance Body',
error: error.message,
success: false,
});
}
};
1 change: 1 addition & 0 deletions src/controllers/issuance.controller.js
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ export const findAll = async (req, res) => {
res.status(400).json({
message: 'Can not retreive issuances',
error: error.message,
success: false,
});
}
};
1 change: 1 addition & 0 deletions src/controllers/label.controller.js
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ export const findAll = async (req, res) => {
res.status(400).json({
message: 'Can not retreive labels',
error: error.message,
success: false,
});
}
};
6 changes: 6 additions & 0 deletions src/controllers/offer.controller.js
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ export const generateOfferFile = async (req, res) => {
res.status(400).json({
message: 'Error generating offer file.',
error: error.message,
success: false,
});
}
};
@@ -67,6 +68,7 @@ export const cancelActiveOffer = async (req, res) => {
res.status(400).json({
message: 'Can not cancel active offer',
error: error.message,
success: false,
});
}
};
@@ -106,6 +108,7 @@ export const importOfferFile = async (req, res) => {
res.status(400).json({
message: 'Can not import offer file.',
error: error.message,
success: false,
});
}
};
@@ -140,6 +143,7 @@ export const commitImportedOfferFile = async (req, res) => {
res.status(400).json({
message: 'Can not commit offer.',
error: error.message,
success: false,
});
}
};
@@ -157,6 +161,7 @@ export const cancelImportedOfferFile = async (req, res) => {
res.status(400).json({
message: 'Can not cancel offer.',
error: error.message,
success: false,
});
}
};
@@ -231,6 +236,7 @@ export const getCurrentOfferInfo = async (req, res) => {
res.status(400).json({
message: 'Can not get offer.',
error: error.message,
success: false,
});
}
};
17 changes: 17 additions & 0 deletions src/controllers/organization.controller.js
Original file line number Diff line number Diff line change
@@ -38,12 +38,14 @@ export const editHomeOrg = async (req, res) => {

return res.json({
message: 'Home org currently being updated, will be completed soon.',
success: true
});
} catch (error) {
console.trace(error);
res.status(400).json({
message: 'Error initiating your organization',
error: error.message,
success: false,
});
}
};
@@ -86,6 +88,7 @@ export const createV2 = async (req, res) => {
res.status(400).json({
message: 'Error initiating your organization',
error: error.message,
success: false,
});
}
};
@@ -119,6 +122,7 @@ export const create = async (req, res) => {
res.status(400).json({
message: 'Error initiating your organization',
error: error.message,
success: false,
});
}
};
@@ -143,6 +147,7 @@ export const resetHomeOrg = async (req, res) => {
res.status(400).json({
message: 'Error resetting your organization',
error: error.message,
success: false,
});
}
};
@@ -165,6 +170,7 @@ export const importOrg = async (req, res) => {
res.status(400).json({
message: 'Error importing organization',
error: error.message,
success: false,
});
}
};
@@ -186,6 +192,7 @@ export const importHomeOrg = async (req, res) => {
res.status(400).json({
message: 'Error importing organization',
error: error.message,
success: false,
});
}
};
@@ -205,6 +212,7 @@ export const subscribeToOrganization = async (req, res) => {
res.status(400).json({
message: 'Error subscribing to organization',
error: error.message,
success: false,
});
}
};
@@ -239,6 +247,7 @@ export const deleteImportedOrg = async (req, res) => {
res.status(400).json({
message: 'Error unsubscribing to organization',
error: error.message,
success: false,
});
if (transaction) {
await transaction.rollback();
@@ -278,6 +287,7 @@ export const unsubscribeToOrganization = async (req, res) => {
res.status(400).json({
message: 'Error unsubscribing to organization',
error: error.message,
success: false,
});

if (transaction) {
@@ -317,6 +327,7 @@ export const resyncOrganization = async (req, res) => {
res.status(400).json({
message: 'Error resyncing organization',
error: error.message,
success: false,
});

if (transaction) {
@@ -335,12 +346,14 @@ export const addMetadata = async (req, res) => {

return res.json({
message: 'Home org currently being updated, will be completed soon.',
success: true
});
} catch (error) {
console.trace(error);
res.status(400).json({
message: 'Error adding metadata to your organization',
error: error.message,
success: false,
});
}
};
@@ -359,6 +372,7 @@ export const addMirror = async (req, res) => {
res.status(400).json({
message: 'Error adding mirror',
error: error.message,
success: false,
});
}
};
@@ -376,6 +390,7 @@ export const getMetaData = async (req, res) => {
res.status(400).json({
message: 'Error getting metadata for organization',
error: error.message,
success: false,
});
}
};
@@ -393,6 +408,7 @@ export const removeMirror = async (req, res) => {
} catch (error) {
res.status(400).json({
message: 'Error removing mirror for organization',
success: false,
});
}
};
@@ -407,6 +423,7 @@ export const sync = async (req, res) => {
res.status(400).json({
message: 'Cant All Organizations Metadata',
error: error.message,
success: false,
});
}
};
Loading

0 comments on commit b8c7d3d

Please sign in to comment.