#fix: thuanvv fix api

src/application/classes/queries/get-class-by-id/get-class-by-id-query-mapper.ts

@@ -4,7 +4,7 @@ import { ClassEntity } from "@domain/entities";
 export function map(renamedClass: ClassEntity, language: string): ClassDTO {
   return {
     id: renamedClass.id?.toString() || '',
-    title: language === 'vi' ? renamedClass.vi_name : renamedClass.en_name,
+    name: language === 'vi' ? renamedClass.vi_name : renamedClass.en_name,
     description: language === 'vi' ? renamedClass.vi_description || '' : renamedClass.en_description || '',
     content: language === 'vi' ? renamedClass.vi_content || '' : renamedClass.en_content || '',
     image: renamedClass.image || null,

src/application/classes/queries/list-highlight-classes/list-highlight-classes-query-mapper.ts

@@ -4,7 +4,7 @@ import { ClassEntity } from "@domain/entities";
 export function map(renamedClass: ClassEntity, language: string): ClassDTO {
   return {
     id: renamedClass.id?.toString() || '',
-    title: language === 'vi' ? renamedClass.vi_name : renamedClass.en_name,
+    name: language === 'vi' ? renamedClass.vi_name : renamedClass.en_name,
     description: language === 'vi' ? renamedClass.vi_description || '' : renamedClass.en_description || '',
     content: language === 'vi' ? renamedClass.vi_content || '' : renamedClass.en_content || '',
     image: renamedClass.image || null,

src/application/classes/queries/list-short-classes/list-short-classes-query-mapper.ts

@@ -6,7 +6,7 @@ type HighlightClassDTO = Omit<ClassDTO, 'description' | 'content' | 'image' | 's
 export function map(renamedClass: ClassEntity, language: string): HighlightClassDTO {
   return {
     id: renamedClass.id?.toString() || '',
-    title: language === 'vi' ? renamedClass.vi_name : renamedClass.en_name,
+    name: language === 'vi' ? renamedClass.vi_name : renamedClass.en_name,
     order: renamedClass.order || null,
   };
 }

src/application/common/interfaces/core-system-configs-repository.ts

@@ -1,6 +1,6 @@
-import { ConfigSystem } from '@domain/entities';
+import { CoreSystemConfigEntity } from '@domain/entities';
 
-export interface ConfigSystemsRepository {
-  website(): Promise<{ data: Array<ConfigSystem> }>;
-  registration(): Promise<{ data: Array<ConfigSystem> }>;
+export interface CoreSystemConfigsRepository {
+  website(): Promise<CoreSystemConfigEntity[] | []>;
+  registration(): Promise<CoreSystemConfigEntity[] | []>;
 }

src/application/common/interfaces/index.ts

@@ -12,3 +12,4 @@ export * from './lecture-types-repository';
 export * from './feedbacks-repository';
 export * from './news-categories-repository';
 export * from './news-repository';
+export * from './core-system-configs-repository';

src/application/core-system-config/index.ts

@@ -0,0 +1,11 @@
+import { makeGetWebsiteQuery } from "./queries/get-website";
+import { makeGetRegistrationQuery } from "./queries/get-registration";
+
+export function makeCoreSystemConfigsUseCases(dependencies: Dependencies) {
+  return {
+    queries: {
+      getWebsite: makeGetWebsiteQuery(dependencies),
+      getRegistration: makeGetRegistrationQuery(dependencies),
+    },
+  };
+}

src/application/core-system-config/queries/get-registration/get-registration-query-mapper.ts

@@ -0,0 +1,21 @@
+import { CoreSystemConfigEntity } from "@domain/entities";
+import { CoreSystemConfigDTO } from "@domain/dtos/core-system-config";
+
+export function map(coreSystemConfig: CoreSystemConfigEntity): CoreSystemConfigDTO {
+  return {
+    id: Number(coreSystemConfig.id),
+    group: coreSystemConfig.group,
+    type: coreSystemConfig.type,
+    value: coreSystemConfig.value,
+    image: coreSystemConfig.image || "",
+    description_vi: coreSystemConfig.description_vi || "",
+    description_en: coreSystemConfig.description_en || "",
+    order: Number(coreSystemConfig.order),
+    block_delete: coreSystemConfig.block_delete || 0,
+    status: Number(coreSystemConfig.status),
+    created_at: coreSystemConfig.created_at?.toISOString() || null,
+    updated_at: coreSystemConfig.updated_at?.toISOString() || null,
+    created_by: coreSystemConfig.created_by || "",
+    updated_by: coreSystemConfig.updated_by || ""
+  };
+}

src/application/core-system-config/queries/get-registration/get-registration-query.ts

@@ -0,0 +1,10 @@
+import { map } from "./get-registration-query-mapper";
+
+export function makeGetRegistrationQuery({ coreSystemConfigsRepository }: Pick<Dependencies, 'coreSystemConfigsRepository'>) {
+  return async function getRegistrationQuery() {
+
+    const coreRegistrationSystemConfig = await coreSystemConfigsRepository.registration();
+
+    return coreRegistrationSystemConfig.map((item) => map(item));
+  };
+}

src/application/core-system-config/queries/get-registration/index.ts

@@ -0,0 +1 @@
+export * from './get-registration-query';

src/application/core-system-config/queries/get-website/get-website-query-mapper.ts

@@ -0,0 +1,21 @@
+import { CoreSystemConfigEntity } from "@domain/entities";
+import { CoreSystemConfigDTO } from "@domain/dtos/core-system-config";
+
+export function map(coreSystemConfig: CoreSystemConfigEntity): CoreSystemConfigDTO {
+  return {
+    id: Number(coreSystemConfig.id),
+    group: coreSystemConfig.group,
+    type: coreSystemConfig.type,
+    value: coreSystemConfig.value,
+    image: coreSystemConfig.image || "",
+    description_vi: coreSystemConfig.description_vi || "",
+    description_en: coreSystemConfig.description_en || "",
+    order: Number(coreSystemConfig.order),
+    block_delete: coreSystemConfig.block_delete || 0,
+    status: Number(coreSystemConfig.status),
+    created_at: coreSystemConfig.created_at?.toISOString() || null,
+    updated_at: coreSystemConfig.updated_at?.toISOString() || null,
+    created_by: coreSystemConfig.created_by || "",
+    updated_by: coreSystemConfig.updated_by || ""
+  };
+}

src/application/core-system-config/queries/get-website/get-website-query.ts

@@ -0,0 +1,10 @@
+import { map } from "./get-website-query-mapper";
+
+export function makeGetWebsiteQuery({ coreSystemConfigsRepository }: Pick<Dependencies, 'coreSystemConfigsRepository'>) {
+  return async function getWebsiteQuery() {
+
+    const coreWebsiteSystemConfig = await coreSystemConfigsRepository.website();
+
+    return coreWebsiteSystemConfig.map((item) => map(item));
+  };
+}

src/application/core-system-config/queries/get-website/index.ts

@@ -0,0 +1 @@
+export * from './get-website-query';

src/application/news/queries/get-by-category/get-by-category-query-mapper.ts

@@ -10,6 +10,7 @@ export function map(news: NewsEntity, language: string): NewsDTO {
     read_time: news.read_time || 1,
     title: language === 'vi' ? news.vi_title || '' : news.en_title || '',
     description: language === 'vi' ? news.vi_description || '' : news.en_description || '',
+    content: language === 'vi' ? news.vi_content || '' : news.en_content || '',
     order: news.order || null,
     status: news.status,
     created_at: news.created_at ? news.created_at.toISOString() : null,

src/application/news/queries/get-by-slug/get-by-slug-query-mapper.ts

@@ -10,6 +10,7 @@ export function map(news: NewsEntity, language: string): NewsDTO {
     read_time: news.read_time || 1,
     title: language === 'vi' ? news.vi_title || '' : news.en_title || '',
     description: language === 'vi' ? news.vi_description || '' : news.en_description || '',
+    content: language === 'vi' ? news.vi_content || '' : news.en_content || '',
     order: news.order || null,
     status: news.status,
     created_at: news.created_at ? news.created_at.toISOString() : null,

src/application/news/queries/get-related/get-related-query-mapper.ts

@@ -10,6 +10,7 @@ export function map(news: NewsEntity, language: string): NewsDTO {
     read_time: news.read_time || 1,
     title: language === 'vi' ? news.vi_title || '' : news.en_title || '',
     description: language === 'vi' ? news.vi_description || '' : news.en_description || '',
+    content: language === 'vi' ? news.vi_content || '' : news.en_content || '',
     order: news.order || null,
     status: news.status,
     created_at: news.created_at ? news.created_at.toISOString() : null,

src/domain/dtos/class.ts

@@ -1,6 +1,6 @@
 export interface ClassDTO {
   id: string;
-  title: string;
+  name: string;
   description: string;
   content: string;
   image: string | null;

src/domain/dtos/core-system-config.ts

@@ -0,0 +1,16 @@
+export interface CoreSystemConfigDTO {
+  id: number;
+  group: string;
+  type: string;
+  value: string;
+  image: null | string;
+  description_vi: string;
+  description_en: string;
+  order: number;
+  block_delete: number;
+  status: number;
+  created_at: string | null;
+  updated_at: string | null;
+  created_by: string | null;
+  updated_by: string | null;
+}

src/domain/dtos/news.ts

@@ -5,6 +5,7 @@ export interface NewsDTO {
   read_time: number;
   image: string;
   title: string | null;
+  content: string | null;
   description: string | null;
   order: number | null;
   status: number;

src/domain/entities/core-system-config.ts

@@ -1,48 +1,48 @@
-export class ConfigSystem {
+export class CoreSystemConfigEntity {
   public id?: number;
   public group: string;
   public type: string;
   public value: string;
-  public image?: string;
-  public descriptionVi: string;
-  public descriptionEn?: string;
-  public order?: number;
-  public blockDelete?: boolean;
-  public status?: boolean;
-  public createdAt?: Date;
-  public updatedAt?: Date;
-  public createdBy?: string;
-  public updatedBy?: string;
+  public image?: string | null;
+  public description_vi: string;
+  public description_en?: string | null;
+  public order?: number | null;
+  public block_delete?: number | null;
+  public status?: boolean | null;
+  public created_at?: Date | null;
+  public updated_at?: Date | null;
+  public created_by?: string | null;
+  public updated_by?: string | null;
 
-  constructor(config: {
+  constructor(coreSystemConfigEntity: {
     id?: number;
     group: string;
     type: string;
     value: string;
     image?: string;
-    descriptionVi: string;
-    descriptionEn?: string;
+    description_vi: string;
+    description_en?: string;
     order?: number;
-    blockDelete?: boolean;
+    block_delete?: number;
     status?: boolean;
-    createdAt?: Date;
-    updatedAt?: Date;
-    createdBy?: string;
-    updatedBy?: string;
+    created_at?: Date;
+    updated_at?: Date;
+    created_by?: string;
+    updated_by?: string;
   }) {
-    this.id = config.id;
-    this.group = config.group;
-    this.type = config.type;
-    this.value = config.value;
-    this.image = config.image;
-    this.descriptionVi = config.descriptionVi;
-    this.descriptionEn = config.descriptionEn;
-    this.order = config.order;
-    this.blockDelete = config.blockDelete;
-    this.status = config.status;
-    this.createdAt = config.createdAt;
-    this.updatedAt = config.updatedAt;
-    this.createdBy = config.createdBy;
-    this.updatedBy = config.updatedBy;
+    this.id = coreSystemConfigEntity.id;
+    this.group = coreSystemConfigEntity.group;
+    this.type = coreSystemConfigEntity.type;
+    this.value = coreSystemConfigEntity.value;
+    this.image = coreSystemConfigEntity.image;
+    this.description_vi = coreSystemConfigEntity.description_vi;
+    this.description_en = coreSystemConfigEntity.description_en;
+    this.order = coreSystemConfigEntity.order;
+    this.block_delete = coreSystemConfigEntity.block_delete;
+    this.status = coreSystemConfigEntity.status;
+    this.created_at = coreSystemConfigEntity.created_at;
+    this.updated_at = coreSystemConfigEntity.updated_at;
+    this.created_by = coreSystemConfigEntity.created_by;
+    this.updated_by = coreSystemConfigEntity.updated_by;
   }
 }

src/infrastructure/di.ts

@@ -22,6 +22,7 @@ export type Dependencies = {
   lecturersRepository: Interfaces.LecturersRepository;
   newsCategoriesRepository: Interfaces.NewsCategoriesRepository;
   newsRepository: Interfaces.NewsRepository;
+  coreSystemConfigsRepository: Interfaces.CoreSystemConfigsRepository
 };
 
 export function makeInfrastructureDependencies(): {
@@ -52,5 +53,6 @@ export function makeInfrastructureDependencies(): {
     lecturersRepository: asFunction(repositories.makeLecturersRepository).singleton(),
     newsCategoriesRepository: asFunction(repositories.makeNewsCategoriesRepository).singleton(),
     newsRepository: asFunction(repositories.makeNewsRepository).singleton(),
+    coreSystemConfigsRepository: asFunction(repositories.makeCoreSystemConfigRepository).singleton(),
   };
 }

src/infrastructure/repositories/core-system-config-repository.ts

@@ -0,0 +1,43 @@
+import { CoreSystemConfigsRepository } from '@application/common/interfaces';
+
+export function makeCoreSystemConfigRepository({ db }: Dependencies): CoreSystemConfigsRepository {
+  return {
+    async website() {
+      const coreSystemConfig = await db.core_system_config.findMany({
+        where: {
+          group: 'Website',
+          type: 'Footer',
+          status: 1,
+        },
+        orderBy: {
+          order: 'asc',
+        },
+      });
+
+      return coreSystemConfig.map((config) => ({
+        ...config,
+        status: config.status === 1,
+        id: Number(config.id),
+      }));
+    },
+
+
+    async registration() {
+      const coreSystemConfig = await db.core_system_config.findMany({
+        where: {
+          group: 'Registration',
+          status: 1,
+        },
+        orderBy: {
+          order: 'asc',
+        },
+      });
+
+      return coreSystemConfig.map((config) => ({
+        ...config,
+        status: config.status === 1,
+        id: Number(config.id),
+      }));
+    },
+  };
+}

src/infrastructure/repositories/index.ts

@@ -10,3 +10,4 @@ export * from './lecture-type-repository';
 export * from './lecturer-repository';
 export * from './news-categories-repository';
 export * from './news-repository';
+export * from './core-system-config-repository';