feat: add primary key sorting

Author: NarrowsProjects

lib/database/repositories/Repository.js

@@ -40,7 +40,7 @@ class Repository {
         }
 
         if (findQuery instanceof QueryBuilder) {
-            findQuery = findQuery.toImplementation();
+            findQuery = findQuery.toImplementation(this.model);
         }
 
         return this.model.count(findQuery);
@@ -53,7 +53,7 @@ class Repository {
      * @returns {Promise<array>} Promise object representing the full mock data
      */
     async findAll(findQuery = {}) {
-        return this.model.findAll(findQuery instanceof QueryBuilder ? findQuery.toImplementation() : findQuery);
+        return this.model.findAll(findQuery instanceof QueryBuilder ? findQuery.toImplementation(this.model) : findQuery);
     }
 
     /**
@@ -69,7 +69,7 @@ class Repository {
 
         if (findQuery instanceof QueryBuilder) {
             findQuery.set('distinct', true);
-            findQuery = findQuery.toImplementation();
+            findQuery = findQuery.toImplementation(this.model);
         }
 
         return this.model.findAndCountAll(findQuery);
@@ -83,7 +83,7 @@ class Repository {
      */
     async findOne(findQuery = {}) {
         if (findQuery instanceof QueryBuilder) {
-            findQuery = findQuery.toImplementation();
+            findQuery = findQuery.toImplementation(this.model);
         }
         findQuery.limit = 1;
         return this.model.findOne(findQuery);
@@ -133,7 +133,7 @@ class Repository {
      */
     async removeAll(findQuery) {
         if (findQuery instanceof QueryBuilder) {
-            findQuery = findQuery.toImplementation();
+            findQuery = findQuery.toImplementation(this.model);
         }
 
         const entities = await this.findAll(findQuery);
@@ -152,7 +152,7 @@ class Repository {
      */
     async removeOne(findQuery) {
         if (findQuery instanceof QueryBuilder) {
-            findQuery = findQuery.toImplementation();
+            findQuery = findQuery.toImplementation(this.model);
         }
         findQuery.limit = 1;
 
@@ -184,7 +184,7 @@ class Repository {
      */
     async updateAll(patch, findQuery) {
         if (findQuery instanceof QueryBuilder) {
-            findQuery = findQuery.toImplementation();
+            findQuery = findQuery.toImplementation(this.model);
         }
 
         return this.model.update(patch, findQuery);

lib/database/utilities/QueryBuilder.js

@@ -620,17 +620,20 @@ class QueryBuilder {
 
     /**
      * Returns the implementation specific query.
-     *
+     * 
+     * @param {Object|string} model The database model or model identifier.
      * @returns {Object} Implementation specific query.
      */
-    toImplementation() {
+    toImplementation(model) {
         const options = { ...this.options };
         const hasExplicitColumns = options.attributes.some((attribute) => typeof attribute === 'string');
+        model = typeof model === 'string' ? this._sequelize.models[model] : model;
 
         if (!this._selectOnly && !hasExplicitColumns) {
             options.attributes = { include: options.attributes };
         } else {
-            this.orderBy('id', 'asc'); // Array syntax is inconsistent with its sorting unless explicitly defined
+            const primaryKey = model.primaryKeyAttribute;
+            this.orderBy(primaryKey, 'asc'); // Array syntax is inconsistent with its sorting unless explicitly defined
         }
 
         return options;