removed constants from model layer
This commit is contained in:
parent
54bc80b08d
commit
fa15b87e5e
3 changed files with 36 additions and 39 deletions
|
@ -3,6 +3,7 @@ const logger = require('winston');
|
|||
|
||||
const DEFAULT_THUMBNAIL = 'https://spee.ch/assets/img/video_thumb_default.png';
|
||||
const NO_CHANNEL = 'NO_CHANNEL';
|
||||
const NO_CLAIM = 'NO_CLAIM';
|
||||
const NO_FILE = 'NO_FILE';
|
||||
|
||||
module.exports = {
|
||||
|
@ -16,9 +17,12 @@ module.exports = {
|
|||
getClaimIdByClaim (claimName, claimId) {
|
||||
logger.debug(`getClaimIdByClaim(${claimName}, ${claimId})`);
|
||||
return new Promise((resolve, reject) => {
|
||||
db.Claim.getLongClaimId(claimName, claimId) // get the long claim id
|
||||
.then(result => {
|
||||
resolve(result); // resolves with NO_CLAIM or valid claim id
|
||||
db.Claim.getLongClaimId(claimName, claimId)
|
||||
.then(longClaimId => {
|
||||
if (!longClaimId) {
|
||||
resolve(NO_CLAIM);
|
||||
}
|
||||
resolve(longClaimId);
|
||||
})
|
||||
.catch(error => {
|
||||
reject(error);
|
||||
|
@ -29,15 +33,20 @@ module.exports = {
|
|||
logger.debug(`getClaimIdByChannel(${channelName}, ${channelClaimId}, ${claimName})`);
|
||||
return new Promise((resolve, reject) => {
|
||||
db.Certificate.getLongChannelId(channelName, channelClaimId) // 1. get the long channel id
|
||||
.then(result => {
|
||||
if (result === NO_CHANNEL) {
|
||||
resolve(result); // resolves NO_CHANNEL
|
||||
return;
|
||||
.then(longChannelId => {
|
||||
if (!longChannelId) {
|
||||
return [null, null];
|
||||
}
|
||||
return db.Claim.getClaimIdByLongChannelId(result, claimName); // 2. get the long claim id
|
||||
return Promise.all([longChannelId, db.Claim.getClaimIdByLongChannelId(longChannelId, claimName)]); // 2. get the long claim id
|
||||
})
|
||||
.then(result => {
|
||||
resolve(result); // resolves with NO_CLAIM or valid claim id
|
||||
.then(([longChannelId, longClaimId]) => {
|
||||
if (!longChannelId) {
|
||||
return resolve(NO_CHANNEL);
|
||||
}
|
||||
if (!longClaimId) {
|
||||
return resolve(NO_CLAIM);
|
||||
}
|
||||
resolve(longClaimId);
|
||||
})
|
||||
.catch(error => {
|
||||
reject(error);
|
||||
|
@ -46,30 +55,19 @@ module.exports = {
|
|||
},
|
||||
getChannelContents (channelName, channelClaimId) {
|
||||
return new Promise((resolve, reject) => {
|
||||
let longChannelClaimId;
|
||||
let shortChannelClaimId;
|
||||
db.Certificate.getLongChannelId(channelName, channelClaimId) // 1. get the long channel Id
|
||||
.then(result => { // 2. get all claims for that channel
|
||||
if (result === NO_CHANNEL) {
|
||||
return NO_CHANNEL;
|
||||
.then(longChannelClaimId => { // 2. get all claims for that channel
|
||||
if (!longChannelClaimId) {
|
||||
return [null, null, null];
|
||||
}
|
||||
longChannelClaimId = result;
|
||||
return db.Certificate.getShortChannelIdFromLongChannelId(longChannelClaimId, channelName);
|
||||
return Promise.all([longChannelClaimId, db.Certificate.getShortChannelIdFromLongChannelId(longChannelClaimId, channelName), db.Claim.getAllChannelClaims(longChannelClaimId)]);
|
||||
})
|
||||
.then(result => { // 3. get all Claim records for this channel
|
||||
if (result === NO_CHANNEL) {
|
||||
return NO_CHANNEL;
|
||||
.then(([longChannelClaimId, shortChannelClaimId, channelClaimsArray]) => { // 4. add extra data not available from Claim table
|
||||
if (!longChannelClaimId) {
|
||||
return resolve(NO_CHANNEL);
|
||||
}
|
||||
shortChannelClaimId = result;
|
||||
return db.Claim.getAllChannelClaims(longChannelClaimId);
|
||||
})
|
||||
.then(result => { // 4. add extra data not available from Claim table
|
||||
if (result === NO_CHANNEL) {
|
||||
resolve(result);
|
||||
return;
|
||||
}
|
||||
if (result) {
|
||||
result.forEach(element => {
|
||||
if (channelClaimsArray) {
|
||||
channelClaimsArray.forEach(element => {
|
||||
const fileExtenstion = element.contentType.substring(element.contentType.lastIndexOf('/') + 1);
|
||||
element['showUrlLong'] = `/${channelName}:${longChannelClaimId}/${element.name}`;
|
||||
element['directUrlLong'] = `/${channelName}:${longChannelClaimId}/${element.name}.${fileExtenstion}`;
|
||||
|
@ -82,7 +80,7 @@ module.exports = {
|
|||
channelName,
|
||||
longChannelClaimId,
|
||||
shortChannelClaimId,
|
||||
claims: result,
|
||||
claims: channelClaimsArray,
|
||||
});
|
||||
})
|
||||
.catch(error => {
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
const logger = require('winston');
|
||||
const { returnShortId } = require('../helpers/sequelizeHelpers.js');
|
||||
const NO_CHANNEL = 'NO_CHANNEL';
|
||||
|
||||
module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
|
||||
const Certificate = sequelize.define(
|
||||
|
@ -138,7 +137,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
|
|||
.then(result => {
|
||||
switch (result.length) {
|
||||
case 0:
|
||||
return resolve(NO_CHANNEL);
|
||||
return resolve(null);
|
||||
default: // note results must be sorted
|
||||
return resolve(result[0].claimId);
|
||||
}
|
||||
|
@ -160,7 +159,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
|
|||
.then(result => {
|
||||
switch (result.length) {
|
||||
case 0:
|
||||
return resolve(NO_CHANNEL);
|
||||
return resolve(null);
|
||||
default:
|
||||
return resolve(result[0].claimId);
|
||||
}
|
||||
|
@ -178,7 +177,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
|
|||
})
|
||||
.then(result => {
|
||||
if (!result) {
|
||||
return resolve(NO_CHANNEL);
|
||||
return resolve(null);
|
||||
};
|
||||
resolve(claimId);
|
||||
})
|
||||
|
|
|
@ -213,7 +213,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
|
|||
.then(result => {
|
||||
switch (result.length) {
|
||||
case 0:
|
||||
return resolve(NO_CLAIM);
|
||||
return resolve(null);
|
||||
case 1:
|
||||
return resolve(result[0].claimId);
|
||||
default:
|
||||
|
@ -241,7 +241,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
|
|||
.then(result => {
|
||||
switch (result.length) {
|
||||
case 0:
|
||||
return resolve(NO_CLAIM);
|
||||
return resolve(null);
|
||||
default: // note results must be sorted
|
||||
return resolve(result[0].claimId);
|
||||
}
|
||||
|
@ -263,7 +263,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
|
|||
logger.debug('length of result', result.length);
|
||||
switch (result.length) {
|
||||
case 0:
|
||||
return resolve(NO_CLAIM);
|
||||
return resolve(null);
|
||||
default:
|
||||
return resolve(result[0].dataValues.claimId);
|
||||
}
|
||||
|
@ -281,7 +281,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
|
|||
})
|
||||
.then(result => {
|
||||
if (!result) {
|
||||
return resolve(NO_CLAIM);
|
||||
return resolve(null);
|
||||
};
|
||||
resolve(claimId);
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue