@solidstarters/solid-core 1.2.81 → 1.2.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.81",
+  "version": "1.2.83",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/services/crud-helper.service.ts

@@ -53,7 +53,7 @@ export class CrudHelperService {
                 }
                 else { // Recursively call the applyFilters method to handle nested conditions
                     const joinField = `${alias}.${key}`;
-                    if (!this.isRelationJoined(selectQb, joinField)) selectQb.leftJoin(joinField, key);
+                        if (!this.isRelationJoined(selectQb, joinField)) selectQb.leftJoin(joinField, key);
                     this.applyFilters(qb, primaryFilterObj, key, selectQb);
                 }
             });
@@ -259,6 +259,11 @@ export class CrudHelperService {
                 const joinAlias = relationParts.slice(0, i + 1).join('_');
                 qb.leftJoinAndSelect(joinProperty, joinAlias); 
             }
+            else {
+                // Since in populate, we are create a unique alias based on the relation path
+                //If the join is already present, it is probably because of the relation being passed in the where filter i.e applyFilters method
+                qb.addSelect(`${part}`); 
+            }
             parentAlias = part; // Update the parent alias for the next iteration
         });
         return qb;

package/src/subscribers/security-rule.subscriber.ts

@@ -59,7 +59,7 @@ export class SecurityRuleSubscriber implements EntitySubscriberInterface<Securit
         }
         const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
 
-        if (metaData.securityRule) {
+        if (metaData.securityRules) {
             const securityRuleIndex = metaData.securityRules?.findIndex((ruleFromFile: { name: string }) => ruleFromFile.name === securityRule.name);
             const {id, roleId, modelMetadataId, ...requiredDto} = await this.securityRuleRepo.toDto(securityRule)
             metaData.securityRules[securityRuleIndex] = {requiredDto, securityRuleConfig: JSON.parse(securityRule.securityRuleConfig)}