Merge pull request #308 from Quickchive/fix/#307-make-parent-id-null

Fix/#307 make parent id null
Quickchive · Mar 10, 2024 · d8a80e4 · d8a80e4
2 parents 4d67d3f + b480015
commit d8a80e4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/categories/category.entity.ts b/src/categories/category.entity.ts
@@ -47,7 +47,7 @@ export class Category extends CoreEntity {
 
   @ApiProperty({ description: 'Category Parent ID', example: 1, type: Number })
   @Column({ type: 'int', nullable: true })
-  parentId?: number;
+  parentId?: number | null;
 
   @ManyToOne(() => User, (user) => user.categories, {
     onDelete: 'CASCADE',

diff --git a/src/categories/category.repository.ts b/src/categories/category.repository.ts
@@ -24,7 +24,7 @@ export class CategoryRepository extends Repository<Category> {
   }
 
   async createOne(
-    category: Category & { parentId?: number },
+    category: Category & { parentId?: number | null },
     entityManager?: EntityManager,
   ): Promise<Category> {
     return entityManager ? entityManager?.save(category) : this.save(category);

diff --git a/src/categories/category.service.ts b/src/categories/category.service.ts
@@ -244,11 +244,12 @@ export class CategoryService {
       // find children categories
       const childrenCategories = await queryRunnerManager.find(Category, {
         where: { parentId: categoryId },
+        order: { createdAt: 'DESC' },
       });
 
       await queryRunnerManager.save(
         childrenCategories.map((childrenCategory) => {
-          childrenCategory.parentId = parentCategory?.id;
+          childrenCategory.parentId = parentCategory?.id ?? null;
           return childrenCategory;
         }),
       );