@rytass/cms-base-nestjs-graphql-module 0.1.22 → 0.1.24

package/data-loaders/article.dataloader.d.ts

@@ -5,8 +5,13 @@ import { CategoryDto } from '../dto/category.dto';
 export declare class ArticleDataLoader {
     private readonly articleRepo;
     constructor(articleRepo: Repository<BaseArticleEntity>);
+    private readonly batchLoadCategories;
     readonly categoriesLoader: DataLoader<{
         articleId: string;
         language?: string;
     }, CategoryDto[], string>;
+    readonly categoriesLoaderNoCache: DataLoader<{
+        articleId: string;
+        language?: string;
+    }, CategoryDto[], string>;
 }

package/data-loaders/article.dataloader.js

@@ -23,7 +23,7 @@ class ArticleDataLoader {
     constructor(articleRepo){
         this.articleRepo = articleRepo;
     }
-    categoriesLoader = new DataLoader(async (queryArgs)=>{
+    batchLoadCategories = async (queryArgs)=>{
         const qb = this.articleRepo.createQueryBuilder('articles');
         qb.leftJoinAndSelect('articles.categories', 'categories');
         qb.leftJoinAndSelect('categories.multiLanguageNames', 'multiLanguageNames');
@@ -42,7 +42,8 @@ class ArticleDataLoader {
                         ]
                     }), cVars), vars), {});
         return queryArgs.map((arg)=>categoryMap[`${arg.articleId}:${arg.language ?? DEFAULT_LANGUAGE}`] ?? []);
-    }, {
+    };
+    categoriesLoader = new DataLoader(this.batchLoadCategories, {
         cache: true,
         cacheMap: new LRUCache({
             ttl: 1000 * 60,
@@ -51,6 +52,9 @@ class ArticleDataLoader {
         }),
         cacheKeyFn: (queryArgs)=>`${queryArgs.articleId}:${queryArgs.language ?? DEFAULT_LANGUAGE}`
     });
+    categoriesLoaderNoCache = new DataLoader(this.batchLoadCategories, {
+        cache: false
+    });
 }
 ArticleDataLoader = _ts_decorate([
     Injectable(),

package/index.cjs.js

@@ -1126,7 +1126,8 @@ class ArticleQueries {
         return this.articleService.findCollection({
             ...args,
             stage: cmsBaseNestjsModule.ArticleStage.RELEASED,
-            language: this.multiLanguage ? language ?? cmsBaseNestjsModule.DEFAULT_LANGUAGE : undefined
+            language: this.multiLanguage ? language ?? cmsBaseNestjsModule.DEFAULT_LANGUAGE : undefined,
+            sorter: cmsBaseNestjsModule.ArticleSorter.RELEASED_AT_DESC
         });
     }
     async backstageArticle(id, version) {
@@ -1469,7 +1470,7 @@ class ArticleDataLoader {
     constructor(articleRepo){
         this.articleRepo = articleRepo;
     }
-    categoriesLoader = new DataLoader(async (queryArgs)=>{
+    batchLoadCategories = async (queryArgs)=>{
         const qb = this.articleRepo.createQueryBuilder('articles');
         qb.leftJoinAndSelect('articles.categories', 'categories');
         qb.leftJoinAndSelect('categories.multiLanguageNames', 'multiLanguageNames');
@@ -1488,7 +1489,8 @@ class ArticleDataLoader {
                         ]
                     }), cVars), vars), {});
         return queryArgs.map((arg)=>categoryMap[`${arg.articleId}:${arg.language ?? cmsBaseNestjsModule.DEFAULT_LANGUAGE}`] ?? []);
-    }, {
+    };
+    categoriesLoader = new DataLoader(this.batchLoadCategories, {
         cache: true,
         cacheMap: new lruCache.LRUCache({
             ttl: 1000 * 60,
@@ -1497,6 +1499,9 @@ class ArticleDataLoader {
         }),
         cacheKeyFn: (queryArgs)=>`${queryArgs.articleId}:${queryArgs.language ?? cmsBaseNestjsModule.DEFAULT_LANGUAGE}`
     });
+    categoriesLoaderNoCache = new DataLoader(this.batchLoadCategories, {
+        cache: false
+    });
 }
 ArticleDataLoader = _ts_decorate$b([
     common.Injectable(),
@@ -1792,7 +1797,7 @@ class BackstageArticleResolver {
         return article.releasedBy ? this.memberDataloader.loader.load(article.releasedBy) : null;
     }
     categories(article, language = cmsBaseNestjsModule.DEFAULT_LANGUAGE) {
-        return this.articleDataloader.categoriesLoader.load({
+        return this.articleDataloader.categoriesLoaderNoCache.load({
             articleId: article.id,
             language: this.multiLanguage ? language : cmsBaseNestjsModule.DEFAULT_LANGUAGE
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rytass/cms-base-nestjs-graphql-module",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "description": "Rytass Content Management System NestJS Base GraphQL Module",
   "keywords": [
     "rytass",
@@ -26,7 +26,7 @@
     "typeorm": "*"
   },
   "dependencies": {
-    "@rytass/cms-base-nestjs-module": "^0.2.10",
+    "@rytass/cms-base-nestjs-module": "^0.2.12",
     "@rytass/member-base-nestjs-module": "^0.2.18",
     "dataloader": "^2.2.3",
     "lru-cache": "^11.2.4"

package/queries/article.queries.js

@@ -1,5 +1,5 @@
 import { Query, Args, ID, Int, Resolver } from '@nestjs/graphql';
-import { MULTIPLE_LANGUAGE_MODE, DEFAULT_LANGUAGE, ArticleStage, ArticleBaseService } from '@rytass/cms-base-nestjs-module';
+import { MULTIPLE_LANGUAGE_MODE, DEFAULT_LANGUAGE, ArticleStage, ArticleSorter, ArticleBaseService } from '@rytass/cms-base-nestjs-module';
 import { ArticlesArgs } from '../dto/articles.args.js';
 import { IsPublic, AllowActions } from '@rytass/member-base-nestjs-module';
 import { Language } from '../decorators/language.decorator.js';
@@ -43,7 +43,8 @@ class ArticleQueries {
         return this.articleService.findCollection({
             ...args,
             stage: ArticleStage.RELEASED,
-            language: this.multiLanguage ? language ?? DEFAULT_LANGUAGE : undefined
+            language: this.multiLanguage ? language ?? DEFAULT_LANGUAGE : undefined,
+            sorter: ArticleSorter.RELEASED_AT_DESC
         });
     }
     async backstageArticle(id, version) {

package/resolvers/backstage-article.resolver.js

@@ -58,7 +58,7 @@ class BackstageArticleResolver {
         return article.releasedBy ? this.memberDataloader.loader.load(article.releasedBy) : null;
     }
     categories(article, language = DEFAULT_LANGUAGE) {
-        return this.articleDataloader.categoriesLoader.load({
+        return this.articleDataloader.categoriesLoaderNoCache.load({
             articleId: article.id,
             language: this.multiLanguage ? language : DEFAULT_LANGUAGE
         });