remove duplicated entities

admin/datasource.ts

@@ -1,17 +1,15 @@
 import { DataSource } from "typeorm";
 import { User } from "@shared/entities/users/user.entity.js";
 import { ApiEventsEntity } from "@api/modules/api-events/api-events.entity.js";
-import { Country } from "@api/modules/model/entities/country.entity.js";
-import { BaseData } from "@api/modules/model/base-data.entity.js";
-import { ProjectSize } from "@api/modules/model/entities/project-size.entity.js";
-import { FeasibilityAnalysis } from "@api/modules/model/entities/feasability-analysis.entity.js";
-import { ConservationPlanningAndAdmin } from "@api/modules/model/entities/conservation-and-planning-admin.entity.js";
-import { DataCollectionAndFieldCosts } from "@api/modules/model/entities/data-collection-and-field-costs.entity.js";
+import { Country } from "@shared/entities/country.entity.js";
+import { BaseData } from "@shared/entities/base-data.entity.js";
+import { ProjectSize } from "@shared/entities/project-size.entity.js";
+import { FeasibilityAnalysis } from "@shared/entities/feasability-analysis.entity.js";
+import { ConservationPlanningAndAdmin } from "@shared/entities/conservation-and-planning-admin.entity.js";
+import { DataCollectionAndFieldCosts } from "@shared/entities/data-collection-and-field-costs.entity.js";
 
-// TODO: If we go with this, it might be better to share the datasource with the api, right now adminjs throws and error if we import the BACKEND_DB_ENTITIES
-//       we need to fix this and have a single source of truth for the entities
-
-const ENTITIES = [
+// TODO: If we import the COMMON_DATABASE_ENTITIES from shared, we get an error where DataSouce is not set for a given entity
+export const ADMINJS_ENTITIES = [
   User,
   ApiEventsEntity,
   Country,
@@ -29,7 +27,7 @@ export const dataSource = new DataSource({
   password: process.env.DB_PASSWORD || "blue-carbon-cost",
   database: process.env.DB_NAME || "blc",
   // TODO: Use common db entities from shared
-  entities: ENTITIES,
+  entities: ADMINJS_ENTITIES,
   synchronize: false,
   ssl:
     process.env.NODE_ENV === "production"

admin/index.ts

@@ -4,11 +4,11 @@ import AdminJSExpress from "@adminjs/express";
 import express from "express";
 import * as AdminJSTypeorm from "@adminjs/typeorm";
 import { dataSource } from "./datasource.js";
-import { Country } from "@api/modules/model/entities/country.entity.js";
 import { AuthProvider } from "./providers/auth.provider.js";
 import { userResource } from "./resources/users/user.resource.js";
 import { projectSizeResource } from "./resources/project-size/project-size.resource.js";
-import { BaseData } from "@api/modules/model/base-data.entity.js";
+import { BaseData } from "@shared/entities/base-data.entity.js";
+import { Country } from "@shared/entities/country.entity.js";
 
 AdminJS.registerAdapter({
   Database: AdminJSTypeorm.Database,

admin/resources/project-size/project-size.resource.ts

@@ -11,11 +11,12 @@ import {
   ResourceOptions,
   ResourceWithOptions,
 } from "adminjs";
-import { ProjectSize } from "@api/modules/model/entities/project-size.entity.js";
-import { BaseData } from "@api/modules/model/base-data.entity.js";
 import { dataSource } from "../../datasource.js";
-import { Country } from "@api/modules/model/entities/country.entity.js";
+
 import { Sort } from "typeorm";
+import { ProjectSize } from "@shared/entities/project-size.entity.js";
+import { BaseData } from "@shared/entities/base-data.entity.js";
+import { Country } from "@shared/entities/country.entity.js";
 
 const DEFAULT_DIRECTION = "asc";
 

api/src/modules/config/app-config.service.ts

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { TOKEN_TYPE_ENUM } from '@shared/schemas/auth/token-type.schema';
 import { JwtConfigHandler } from '@api/modules/config/auth-config.handler';
+import { COMMON_DATABASE_ENTITIES } from '@shared/lib/db-entities';
 // import { BACKEND_DB_ENTITIES } from '@shared/lib/db-entities';
-import { COMMON_DATABASE_ENTITIES } from '@shared/entities/database.entities';
 
 export type JWTConfig = {
   secret: string;

api/src/modules/import/services/entity.preprocessor.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
-import { Country } from '@api/modules/model/entities/country.entity';
 import { BaseData } from '@shared/entities/base-data.entity';
+import { Country } from '@shared/entities/country.entity';
 
 export type ParsedDBEntities = {
   countries: Country[];

api/src/modules/model/base-data.repository.ts

@@ -1,9 +1,8 @@
-import { DataSource, EntityManager, Repository } from 'typeorm';
+import { DataSource, Repository } from 'typeorm';
 import { Injectable } from '@nestjs/common';
 
 import { ParsedDBEntities } from '@api/modules/import/services/entity.preprocessor';
 
-import { Country } from '@api/modules/model/entities/country.entity';
 import { BaseData } from '@shared/entities/base-data.entity';
 
 @Injectable()

api/src/modules/model/model.module.ts

@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { BaseDataRepository } from '@api/modules/model/base-data.repository';
 import { BaseData } from '@shared/entities/base-data.entity';
-import { ConservationPlanningAndAdmin } from '@shared/entities/conservation-and-planning-admin.entity';
 
 @Module({
   imports: [TypeOrmModule.forFeature([BaseData])],

shared/lib/db-entities.ts

@@ -1,19 +1,19 @@
-// import { User } from "@shared/entities/users/user.entity";
-// import { ApiEventsEntity } from "@api/modules/api-events/api-events.entity";
-// import { Country } from "@api/modules/model/entities/country.entity";
-// import { BaseData } from "@api/modules/model/base-data.entity";
-// import { ProjectSize } from "@api/modules/model/entities/project-size.entity";
-// import { FeasibilityAnalysis } from "@api/modules/model/entities/feasability-analysis.entity";
-// import { ConservationPlanningAndAdmin } from "@api/modules/model/entities/conservation-and-planning-admin.entity";
-// import { DataCollectionAndFieldCosts } from "@api/modules/model/entities/data-collection-and-field-costs.entity";
-//
-// export const BACKEND_DB_ENTITIES = [
-//   User,
-//   ApiEventsEntity,
-//   Country,
-//   BaseData,
-//   ProjectSize,
-//   FeasibilityAnalysis,
-//   ConservationPlanningAndAdmin,
-//   DataCollectionAndFieldCosts,
-// ];
+import { User } from "@shared/entities/users/user.entity";
+import { ApiEventsEntity } from "@api/modules/api-events/api-events.entity";
+import { Country } from "@shared/entities/country.entity";
+import { BaseData } from "@shared/entities/base-data.entity";
+import { ProjectSize } from "@shared/entities/project-size.entity";
+import { FeasibilityAnalysis } from "@shared/entities/feasability-analysis.entity";
+import { ConservationPlanningAndAdmin } from "@shared/entities/conservation-and-planning-admin.entity";
+import { DataCollectionAndFieldCosts } from "@shared/entities/data-collection-and-field-costs.entity";
+
+export const COMMON_DATABASE_ENTITIES = [
+  User,
+  ApiEventsEntity,
+  Country,
+  BaseData,
+  ProjectSize,
+  FeasibilityAnalysis,
+  ConservationPlanningAndAdmin,
+  DataCollectionAndFieldCosts,
+];