fix(sequelize): fix column name selection for belongsTo relation

Resolves: loopbackio#9591 Signed-off-by: KalleV <kvirtaneva@gmail.com> test(sequelize): replicate duplicate column error with Sequelize belongsTo Relates to: - loopbackio#9617 - sourcefuse/loopback4-sequelize#35
KalleV · Sep 4, 2023 · cd8eaa6 · cd8eaa6
1 parent b77f5f0
commit cd8eaa6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/extensions/sequelize/src/__tests__/fixtures/models/appointment.model.ts b/extensions/sequelize/src/__tests__/fixtures/models/appointment.model.ts
@@ -1,4 +1,5 @@
-import {Entity, model, property} from '@loopback/repository';
+import {Entity, belongsTo, model, property} from '@loopback/repository';
+import {Patient} from './patient.model';
 
 @model()
 export class Appointment extends Entity {
@@ -14,9 +15,13 @@ export class Appointment extends Entity {
   })
   doctorId?: number;
 
-  @property({
-    type: 'number',
-  })
+  @belongsTo(
+    () => Patient,
+    {keyTo: 'id', name: 'patient'},
+    {
+      type: 'number',
+    },
+  )
   patientId?: number;
 
   constructor(data?: Partial<Appointment>) {

diff --git a/extensions/sequelize/src/sequelize/sequelize.repository.base.ts b/extensions/sequelize/src/sequelize/sequelize.repository.base.ts
@@ -700,11 +700,13 @@ export class SequelizeCrudRepository<
         entityClass.definition.relations[key].type ===
         LoopbackRelationType.belongsTo
       ) {
-        const foreignKey = (
-          entityClass.definition.relations[key] as BelongsToDefinition
-        ).keyTo;
+        const relation = entityClass.definition.relations[key] as BelongsToDefinition;
+        const foreignKey = relation.keyFrom;
+        const targetKey = relation.keyTo;
+
         sourceModel.belongsTo(targetModel, {
           foreignKey: {name: foreignKey},
+          targetKey,
 
           // Which client will pass on in loopback style include filter, eg. `include: ["thisName"]`
           as: entityClass.definition.relations[key].name,