Merge branch 'master' into beta (#564)

Author: arnaud-moncel

CHANGELOG.md

@@ -5,6 +5,27 @@
 
 * fix incorrect usage of the new connections parameter ([#557](https://github.com/ForestAdmin/forest-express-sequelize/issues/557)) ([2840e41](https://github.com/ForestAdmin/forest-express-sequelize/commit/2840e418bb782a83b861dda217d45b3d70175253))
 
+# [6.5.0](https://github.com/ForestAdmin/forest-express-sequelize/compare/v6.4.2...v6.5.0) (2020-11-27)
+
+
+### Features
+
+* **smart actions:** endpoint that handle forms' load hooks ([0902ef4](https://github.com/ForestAdmin/forest-express-sequelize/commit/0902ef458abf41efb25f0dc024549702a50645fe))
+
+## [6.4.2](https://github.com/ForestAdmin/forest-express-sequelize/compare/v6.4.1...v6.4.2) (2020-11-26)
+
+
+### Bug Fixes
+
+* export error handler middleware ([#552](https://github.com/ForestAdmin/forest-express-sequelize/issues/552)) ([a87591b](https://github.com/ForestAdmin/forest-express-sequelize/commit/a87591b8d5cffc5041fedcb654be2fadfb6dd78f))
+
+## [6.4.1](https://github.com/ForestAdmin/forest-express-sequelize/compare/v6.4.0...v6.4.1) (2020-11-26)
+
+
+### Bug Fixes
+
+* always return primary keys of associated records ([#550](https://github.com/ForestAdmin/forest-express-sequelize/issues/550)) ([57bd84b](https://github.com/ForestAdmin/forest-express-sequelize/commit/57bd84bc992bbe5fd703b2e36c02bb431885535d))
+
 # [7.0.0-beta.1](https://github.com/ForestAdmin/forest-express-sequelize/compare/v6.4.0...v7.0.0-beta.1) (2020-11-24)
 
 
@@ -19,8 +40,6 @@
 connections and objectMapping is now required on Liana.init().
 Update forest-express dependency to 8.0.0-beta.1 (See https://github.com/ForestAdmin/forest-express/tree/v8.0.0-beta.1)
 
-Co-authored-by: jeffladiray <[email protected]>
-
 # [6.4.0](https://github.com/ForestAdmin/forest-express-sequelize/compare/v6.3.15...v6.4.0) (2020-11-17)
 
 

package.json

@@ -40,9 +40,9 @@
     "@babel/plugin-transform-runtime": "7.10.1",
     "@babel/preset-env": "7.10.1",
     "@babel/register": "7.10.1",
-    "@commitlint/cli": "8.3.5",
-    "@commitlint/config-conventional": "8.3.4",
-    "@commitlint/travis-cli": "8.3.5",
+    "@commitlint/cli": "11.0.0",
+    "@commitlint/config-conventional": "11.0.0",
+    "@commitlint/travis-cli": "11.0.0",
     "@semantic-release/changelog": "5.0.1",
     "@semantic-release/git": "9.0.0",
     "@types/jest": "26.0.9",
@@ -57,7 +57,7 @@
     "mysql2": "2.1.0",
     "onchange": "6.0.0",
     "pg": "8.4.2",
-    "semantic-release": "17.0.7",
+    "semantic-release": "17.3.0",
     "semantic-release-slack-bot": "1.6.2",
     "sequelize": "5.21.3",
     "sequelize-fixtures": "1.1.1",

src/index.js

@@ -30,6 +30,7 @@ const REGEX_VERSION = /(\d+\.)?(\d+\.)?(\*|\d+)/;
 
 exports.collection = Interface.collection;
 exports.ensureAuthenticated = Interface.ensureAuthenticated;
+exports.errorHandler = () => Interface.errorHandler({ logger: Interface.logger });
 exports.StatSerializer = Interface.StatSerializer;
 exports.ResourceSerializer = Interface.ResourceSerializer;
 exports.ResourceDeserializer = Interface.ResourceDeserializer;

src/services/query-builder.js

@@ -1,8 +1,42 @@
 import { Schemas } from 'forest-express';
 import Orm from '../utils/orm';
 
+const HAS_ONE = 'HasOne';
+const BELONGS_TO = 'BelongsTo';
+
 const { getReferenceField } = require('../utils/query');
 
+/**
+ * @param {string[]} values
+ * @returns {string[]}
+ */
+function uniqueValues(values) {
+  return Array.from(new Set(values));
+}
+
+/**
+ * @param {string} key
+ * @param {import('sequelize').Association} association
+ * @returns {string}
+ */
+function getTargetFieldName(key, association) {
+  // Defensive programming
+  if (key && association.target.tableAttributes[key]) {
+    return association.target.tableAttributes[key].fieldName;
+  }
+
+  return undefined;
+}
+
+/**
+ * @param {import('sequelize').HasOne|import('sequelize').BelongsTo} association
+ * @returns {string[]}
+ */
+function getMandatoryFields(association) {
+  return association.target.primaryKeyAttributes
+    .map((attribute) => getTargetFieldName(attribute, association));
+}
+
 function QueryBuilder(model, opts, params) {
   const schema = Schemas.schemas[model.name];
 
@@ -28,7 +62,7 @@ function QueryBuilder(model, opts, params) {
     const includes = [];
 
     Object.values(modelForIncludes.associations)
-      .filter((association) => ['HasOne', 'BelongsTo'].includes(association.associationType))
+      .filter((association) => [HAS_ONE, BELONGS_TO].includes(association.associationType))
       .forEach((association) => {
         const targetFields = Object.values(association.target.tableAttributes)
           .map((attribute) => attribute.fieldName);
@@ -43,10 +77,10 @@ function QueryBuilder(model, opts, params) {
         || explicitAttributes.length) {
           // NOTICE: For performance reasons, we only request the keys
           //         as they're the only needed fields for the interface
-          const uniqueExplicitAttributes = Array.from(new Set([
-            association.targetKey,
+          const uniqueExplicitAttributes = uniqueValues([
+            ...getMandatoryFields(association),
             ...explicitAttributes,
-          ].filter(Boolean)));
+          ].filter(Boolean));
 
           const attributes = explicitAttributes.length
             ? uniqueExplicitAttributes