Skip to content

Commit

Permalink
Merge pull request #84 from bcgov/feature/deseng755
Browse files Browse the repository at this point in the history 
feature/deseng755: Fixed conditional in externalLink controller.
  • Loading branch information
@jareth-whitney
jareth-whitney authored Jan 17, 2025
2 parents 9487bee + 58f9124 commit 7ab3330
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions api/controllers/externalLink.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ exports.publicGet = async (args, res) => {
defaultLog.info('EXTERNAL LINK PUBLIC GET');
// Build match query if on exLinkId route
let query = {};

if (args.swagger.params.exLinkId?.value) {
if (args.swagger.params.exLinkId && args.swagger.params.exLinkId.value) {
query = Utils.buildQuery("_id", args.swagger.params.exLinkId.value, query);
} else if (args.swagger.params.exLinkIds?.value?.length > 0) {
} else if (args.swagger.params.exLinkIds && args.swagger.params.exLinkIds.value && args.swagger.params.exLinkIds.value.length > 0) {
query = Utils.buildQuery("_id", args.swagger.params.exLinkIds.value, query);
}

if (args.swagger.params.project?.value) {
if (args.swagger.params.project && args.swagger.params.project.value) {
query = Utils.buildQuery("project", args.swagger.params.project.value, query);
}

Expand All @@ -58,7 +58,7 @@ exports.publicGet = async (args, res) => {
null, // limit
false); // count
defaultLog.info('Got external link file(s):', data);
Utils.recordAction('Get', 'ExternalLink', 'public', args.swagger.params.exLinkId?.value || null);
Utils.recordAction('Get', 'ExternalLink', 'public', args.swagger.params.exLinkId ? args.swagger.params.exLinkId.value : null);
return Actions.sendResponse(res, 200, data);
} catch (e) {
defaultLog.error(e);
Expand All @@ -70,13 +70,13 @@ exports.protectedHead = (args, res) => {
defaultLog.info('EXTERNAL LINK PROTECTED HEAD');
// Build match query if on exLinkId route
let query = {};
if (args.swagger.params.exLinkId?.value) {
if (args.swagger.params.exLinkId && args.swagger.params.exLinkId.value) {
query = Utils.buildQuery("_id", args.swagger.params.exLinkId.value, query);
}
if (args.swagger.params._application?.value) {
if (args.swagger.params._application && args.swagger.params._application.value) {
query = Utils.buildQuery('_application', args.swagger.params._application.value, query);
}
if (args.swagger.params._comment?.value) {
if (args.swagger.params._comment && args.swagger.params._comment.value) {
query = Utils.buildQuery('_comment', args.swagger.params._comment.value, query);
}
// Set query type
Expand All @@ -94,9 +94,9 @@ exports.protectedHead = (args, res) => {
null, // limit
true) // count
.then((data) => {
Utils.recordAction('Head', 'ExternalLink', args.swagger.params.auth_payload.preferred_username, args.swagger.params.exLinkId?.value || null);
Utils.recordAction('Head', 'ExternalLink', args.swagger.params.auth_payload.preferred_username, args.swagger.params.exLinkId ? args.swagger.params.exLinkId.value : null);
if (!(args.swagger.params.exLinkId && args.swagger.params.exLinkId.value) || (data && data.length > 0)) {
res.setHeader('x-total-count', data?.length > 0 ? data[0].total_items : 0);
res.setHeader('x-total-count', data && data.length > 0 ? data[0].total_items : 0);
return Actions.sendResponse(res, 200, data);
} else {
return Actions.sendResponse(res, 404, data);
Expand All @@ -109,12 +109,12 @@ exports.protectedGet = async (args, res) => {
let query = {}, sort = {}, skip = null, limit = null, count = false;

// Build match query if on exLinkId route
if (args.swagger.params.exLinkId?.value) {
if (args.swagger.params.exLinkId && args.swagger.params.exLinkId.value) {
assignIn(query, { _id: mongoose.Types.ObjectId(args.swagger.params.exLinkId.value) });
} else if (args.swagger.params.exLinkIds?.value?.length > 0) {
} else if (args.swagger.params.exLinkIds && args.swagger.params.exLinkIds.value && args.swagger.params.exLinkIds.value.length > 0) {
query = Utils.buildQuery("_id", args.swagger.params.exLinkIds.value);
}
if (args.swagger.params.project?.value) {
if (args.swagger.params.project && args.swagger.params.project.value) {
query = Utils.buildQuery("project", args.swagger.params.project.value, query);
}
// Set query type
Expand All @@ -131,7 +131,7 @@ exports.protectedGet = async (args, res) => {
skip, // skip
limit, // limit
count); // count
Utils.recordAction('Get', 'ExternalLink', args.swagger.params.auth_payload.preferred_username, args.swagger.params.exLinkId?.value || null);
Utils.recordAction('Get', 'ExternalLink', args.swagger.params.auth_payload.preferred_username, args.swagger.params.exLinkId ? args.swagger.params.exLinkId.value : null);
defaultLog.info('Got external file(s):', data);
return Actions.sendResponse(res, 200, data);
} catch (e) {
Expand All @@ -143,8 +143,8 @@ exports.protectedGet = async (args, res) => {
exports.protectedPost = async (args, res, next) => {
defaultLog.info('EXTERNAL LINK PROTECTED POST');
try {
const project = args.swagger.params.project?.value;
defaultLog.info('Section value:', args.swagger.params.section?.value);
const project = args.swagger.params.project && args.swagger.params.project.value;
defaultLog.info('Section value:', args.swagger.params.section ? args.swagger.params.section.value : null);
Promise.resolve()
.then(async () => {
const ExternalLink = mongoose.model('ExternalLink');
Expand All @@ -160,7 +160,7 @@ exports.protectedPost = async (args, res, next) => {
extLink._createdDate = new Date();
extLink.displayName = args.swagger.params.displayName.value;
extLink.externalLink = args.swagger.params.externalLink.value;
extLink.section = args.swagger.params.section?.value;
extLink.section = args.swagger.params.section ? args.swagger.params.section.value : null;
extLink.dateAdded = args.swagger.params.dateAdded.value;
extLink.dateUpdated = args.swagger.params.dateUpdated.value;
extLink.description = args.swagger.params.description.value;
Expand Down

0 comments on commit 7ab3330

Please sign in to comment.