Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Fix query issue. #262

Merged
merged 1 commit into from
Nov 27, 2019
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
26 changes: 14 additions & 12 deletions src/common/db-helper.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
const _ = require('lodash');
const logger = require('./logger');

/*
Expand Down Expand Up @@ -51,29 +50,32 @@ async function scan(model, scanParams) {
/**
* Get single data by query parameters
* @param {Object} model The dynamoose model to query
* @param {Object} params The parameters object
* @param {String} repositoryId The repository id to query
* @param {Number} number The number id to query
* @param {String} provider The provider id to query
* @returns {Promise<void>}
*/
async function queryOne(model, params) {
async function queryOneIssue(model, repositoryId, number, provider) {
logger.debug('Enter queryOne.');

return await new Promise((resolve, reject) => {
const queryParams = {};

_.forOwn(params, (value, key) => {
queryParams[key] = {eq: value};
});

logger.debug(`${JSON.stringify(queryParams)}`);
model.queryOne(queryParams).exec((err, result) => {
logger.debug(`repositoryId : ${repositoryId}`);
logger.debug(`number : ${number}`);
logger.debug(`provider : ${provider}`);
model.query('repositoryId').eq(repositoryId)
.filter('number').eq(number)
.filter('provider').eq(provider)
.all()
.exec((err, result) => {
if (err) {
logger.debug(`queryOne. Error. ${err}`);
return reject(err);
}
logger.debug('queryOne. Result.');
logger.debug(result);

return resolve(result);
return resolve(result.count === 0 ? null : result[0]);
});
});
}
Expand Down Expand Up @@ -167,5 +169,5 @@ module.exports = {
create,
update,
remove,
queryOne
queryOneIssue
};
9 changes: 4 additions & 5 deletions src/services/IssueService.js
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,10 @@ async function recreate(issue, currentUser) {
}
}

const dbIssue = await dbHelper.scanOne(models.Issue, {
number: issueNumber,
provider,
repositoryId: createEvent.data.repository.id
});
const dbIssue = await dbHelper.queryOneIssue(models.Issue,
createEvent.data.repository.id,
issueNumber,
provider);

if (!issue.recreate) {
if (dbIssue) dbIssue.delete();
Expand Down