Skip to content

add support for custom keyTo property in belongsTo relation generator… #11648

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
Abubakar-K-Back wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −4
Open

add support for custom keyTo property in belongsTo relation generator… #11648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions packages/cli/generators/relation/belongs-to-relation.generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ module.exports = class BelongsToRelationGenerator extends (
);

this.artifactInfo.relationPropertyName = options.relationName;
this.artifactInfo.keyTo = options.keyTo;
this.artifactInfo.targetModelPrimaryKey =
options.destinationModelPrimaryKey;
this.artifactInfo.targetModelPrimaryKeyType =
Expand Down Expand Up @@ -85,7 +86,11 @@ module.exports = class BelongsToRelationGenerator extends (
const relationName = options.relationName;
const defaultRelationName = options.defaultRelationName;
const foreignKeyName = options.foreignKeyName;
const fktype = options.destinationModelPrimaryKeyType;
const keyTo = options.keyTo;
const fktype = keyTo
? relationUtils.getModelPropertyType(modelDir, targetModel, keyTo) ||
options.destinationModelPrimaryKeyType
: options.destinationModelPrimaryKeyType;

const project = new relationUtils.AstLoopBackProject();
const sourceFile = relationUtils.addFileToProject(
Expand All @@ -103,6 +108,7 @@ module.exports = class BelongsToRelationGenerator extends (
defaultRelationName,
foreignKeyName,
fktype,
keyTo,
);

relationUtils.addProperty(sourceClass, modelProperty);
Expand All @@ -123,20 +129,29 @@ module.exports = class BelongsToRelationGenerator extends (
defaultRelationName,
foreignKeyName,
fktype,
keyTo,
) {
const keyToOption = keyTo ? `, keyTo: '${keyTo}'` : '';

// checks if relation name is customized
let relationDecorator = [
{
name: 'belongsTo',
arguments: [`() => ${className}`],
arguments: [
keyTo
? `() => ${className}, {keyTo: '${keyTo}'}`
: `() => ${className}`,
],
},
];
// already checked if the relation name is the same as the source key before
if (defaultRelationName !== relationName) {
relationDecorator = [
{
name: 'belongsTo',
arguments: [`() => ${className}, {name: '${relationName}'}`],
arguments: [
`() => ${className}, {name: '${relationName}'${keyToOption}}`,
],
},
];
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/generators/relation/templates/controller-relation-template-belongs-to.ts.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class <%= controllerClassName %> {
@get('/<%= sourceModelPath %>/{id}/<%= targetModelName %>', {
responses: {
'200': {
description: '<%= targetModelClassName %> belonging to <%= sourceModelClassName %>',
description: '<%= targetModelClassName %> belonging to <%= sourceModelClassName %><%= keyTo ? " (resolved via " + targetModelClassName + "." + keyTo + ")" : "" %>',
content: {
'application/json': {
schema: getModelSchemaRef(<%= targetModelClassName %>),
Expand Down
Loading