Skip to content

fix BB-672: rewriting promises using async await in .routes/entity folder #1058

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.

Sign up for GitHub

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

fix BB-672: rewriting promises using async await in .routes/entity folder #1058

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c9c4946
BB-672 rewriting promises using async await in routes/entity folder
Tarunmeena0901 Jan 30, 2024
ed5e87e
minor fix
Tarunmeena0901 Jan 30, 2024
ea22921
renaming variables and logic to remove some confusion regarding promi…
Tarunmeena0901 Feb 22, 2024
ffe1334
Merge remote-tracking branch 'upstream/master' into BB-672
Tarunmeena0901 Jun 21, 2024
be0b067
minor promistakes fix
Tarunmeena0901 Jun 21, 2024
fe69431
Apply suggestions from code review
Tarunmeena0901 Jun 24, 2024
14d752e
minor promistakes fix
Tarunmeena0901 Jun 24, 2024
344f568
Merge branch 'BB-672' of https://github.com/Tarunmeena0901/bookbrainz…
Tarunmeena0901 Jun 24, 2024
587c2db
update try catch block in handleDelete function
Tarunmeena0901 Jun 26, 2024
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
63 changes: 28 additions & 35 deletions src/server/routes/entity/edition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import _ from 'lodash';
import {escapeProps} from '../../helpers/props';
import express from 'express';
import log from 'log';
import {makePromiseFromObject} from '../../../common/helpers/utils';
import target from '../../templates/target';

/** ****************************
Expand Down Expand Up @@ -158,37 +157,35 @@ router.get(
'/create', auth.isAuthenticated, auth.isAuthorized(ENTITY_EDITOR), middleware.loadIdentifierTypes,
middleware.loadEditionStatuses, middleware.loadEditionFormats,
middleware.loadLanguages, middleware.loadRelationshipTypes,
(req:PassportRequest, res, next) => {
async (req:PassportRequest, res, next) => {
const {EditionGroup, Publisher, Work, Author} = req.app.locals.orm;
const propsPromise = generateEntityProps(
const {orm}: {orm?: any} = req.app.locals;

const propsObject = generateEntityProps(
'edition', req, res, {}
);
if (req.query.author) {
propsPromise.author = Author.forge({bbid: req.query.author})
.fetch({require: false, withRelated: 'defaultAlias'})
.then((data) => data && utils.entityToOption(data.toJSON()));
}

// Access edition-group property: can't write req.query.edition-group as the dash makes it invalid Javascript
if (req.query['edition-group']) {
propsPromise.editionGroup =
EditionGroup.forge({bbid: req.query['edition-group']})
.fetch({require: false, withRelated: 'defaultAlias'})
.then((data) => data && utils.entityToOption(data.toJSON()));
}

if (req.query.publisher) {
propsPromise.publisher =
Publisher.forge({bbid: req.query.publisher})
.fetch({require: false, withRelated: 'defaultAlias'})
.then((data) => data && utils.entityToOption(data.toJSON()));
try {
if (req.query.author) {
const data = await orm.func.entity.getEntity(orm, Author, req.query.author, ['defaultAlias']);
propsObject.author = data && utils.entityToOption(data.toJSON());
}
if (req.query['edition-group']) {
const data = await orm.func.entity.getEntity(orm, EditionGroup, req.query['edition-group'], ['defaultAlias']);
propsObject.editionGroup = data && utils.entityToOption(data.toJSON());
}
if (req.query.publisher) {
const data = await orm.func.entity.getEntity(orm, Publisher, req.query.publisher, ['defaultAlias']);
propsObject.publisher = data && utils.entityToOption(data.toJSON());
}
if (req.query.work) {
const data = await orm.func.entity.getEntity(orm, Work, req.query.work, ['defaultAlias']);
propsObject.work = data && utils.entityToOption(data.toJSON());
}
}

if (req.query.work) {
propsPromise.work =
Work.forge({bbid: req.query.work})
.fetch({require: false, withRelated: 'defaultAlias'})
.then((data) => data && utils.entityToOption(data.toJSON()));
catch (err) {
log.debug(err);
return next(err);
}

async function render(props) {
Expand Down Expand Up @@ -275,17 +272,15 @@ router.get(
}));
}

makePromiseFromObject(propsPromise)
.then(render)
.catch(next);
return render(propsObject);
}
);

router.post(
'/create', entityRoutes.displayPreview, auth.isAuthenticatedForHandler, auth.isAuthorized(ENTITY_EDITOR), middleware.loadIdentifierTypes,
middleware.loadEditionStatuses, middleware.loadEditionFormats,
middleware.loadLanguages, middleware.loadRelationshipTypes,
async (req, res, next) => {
async (req, res) => {
// parsing submitted data to correct format
const entity = await utils.parseInitialState(req, 'edition');
if (entity.editionSection) {
Expand All @@ -310,7 +305,7 @@ router.post(
entity.editionSection.publisher = foundOption ? _.omit(foundOption, ['disambiguation']) : null;
}
}
const propsPromise = generateEntityProps(
const propsObject = generateEntityProps(
'edition', req, res, {}, () => entity
);
function render(props) {
Expand All @@ -325,9 +320,7 @@ router.post(
}));
}

makePromiseFromObject(propsPromise)
.then(render)
.catch(next);
return render(propsObject);
}
);

Expand Down
Loading