fix(repository): make sure foreign key property in keyTo exists in ta…

…rget model
loopbackio · Jul 15, 2019 · ce75385 · ce75385
1 parent f0811aa
commit ce75385
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/packages/repository/src/relations/belongs-to/belongs-to-accessor.ts b/packages/repository/src/relations/belongs-to/belongs-to-accessor.ts
@@ -80,7 +80,7 @@ function resolveBelongsToMetadata(relationMeta: BelongsToDefinition) {
   const targetProperties = targetModel.definition.properties;
   debug('relation metadata from %o: %o', targetName, targetProperties);
 
-  if (relationMeta.keyTo) {
+  if (relationMeta.keyTo && targetProperties[relationMeta.keyTo]) {
     // The explict cast is needed because of a limitation of type inference
     return relationMeta as BelongsToResolvedDefinition;
   }

diff --git a/packages/repository/src/relations/has-many/has-many-repository.factory.ts b/packages/repository/src/relations/has-many/has-many-repository.factory.ts
@@ -72,7 +72,13 @@ function resolveHasManyMetadata(
     throw new InvalidRelationError(reason, relationMeta);
   }
 
-  if (relationMeta.keyTo) {
+  const targetModel = relationMeta.target();
+  const targetModelProperties =
+    targetModel.definition && targetModel.definition.properties;
+
+  // Make sure that if it already keys to the foreign key property,
+  // the key exists in the target model
+  if (relationMeta.keyTo && targetModelProperties[relationMeta.keyTo]) {
     // The explict cast is needed because of a limitation of type inference
     return relationMeta as HasManyResolvedDefinition;
   }
@@ -83,17 +89,13 @@ function resolveHasManyMetadata(
     throw new InvalidRelationError(reason, relationMeta);
   }
 
-  const targetModel = relationMeta.target();
   debug(
     'Resolved model %s from given metadata: %o',
     targetModel.modelName,
     targetModel,
   );
   const defaultFkName = camelCase(sourceModel.modelName + '_id');
-  const hasDefaultFkProperty =
-    targetModel.definition &&
-    targetModel.definition.properties &&
-    targetModel.definition.properties[defaultFkName];
+  const hasDefaultFkProperty = targetModelProperties[defaultFkName];
 
   if (!hasDefaultFkProperty) {
     const reason = `target model ${targetModel.name} is missing definition of foreign key ${defaultFkName}`;

diff --git a/packages/repository/src/relations/has-one/has-one-repository.factory.ts b/packages/repository/src/relations/has-one/has-one-repository.factory.ts
@@ -69,7 +69,13 @@ function resolveHasOneMetadata(
     throw new InvalidRelationError(reason, relationMeta);
   }
 
-  if (relationMeta.keyTo) {
+  const targetModel = relationMeta.target();
+  const targetModelProperties =
+    targetModel.definition && targetModel.definition.properties;
+
+  // Make sure that if it already keys to the foreign key property,
+  // the key exists in the target model
+  if (relationMeta.keyTo && targetModelProperties[relationMeta.keyTo]) {
     // The explict cast is needed because of a limitation of type inference
     return relationMeta as HasOneResolvedDefinition;
   }
@@ -80,17 +86,13 @@ function resolveHasOneMetadata(
     throw new InvalidRelationError(reason, relationMeta);
   }
 
-  const targetModel = relationMeta.target();
   debug(
     'Resolved model %s from given metadata: %o',
     targetModel.modelName,
     targetModel,
   );
   const defaultFkName = camelCase(sourceModel.modelName + '_id');
-  const hasDefaultFkProperty =
-    targetModel.definition &&
-    targetModel.definition.properties &&
-    targetModel.definition.properties[defaultFkName];
+  const hasDefaultFkProperty = targetModelProperties[defaultFkName];
 
   if (!hasDefaultFkProperty) {
     const reason = `target model ${targetModel.name} is missing definition of foreign key ${defaultFkName}`;