Remove _2 suffix from new tables

admin/datasource.ts

@@ -3,58 +3,58 @@ import { User } from "@shared/entities/users/user.entity.js";
 import { ApiEventsEntity } from "@api/modules/api-events/api-events.entity.js";
 import { Country } from "@shared/entities/country.entity.js";
 import { Project } from "@shared/entities/projects.entity.js";
-import { ProjectSize2 } from "@shared/entities/cost-inputs/project-size.entity.js";
-import { FeasibilityAnalysis2 } from "@shared/entities/cost-inputs/feasability-analysis.entity.js";
-import { ConservationPlanningAndAdmin2 } from "@shared/entities/cost-inputs/conservation-and-planning-admin.entity.js";
-import { DataCollectionAndFieldCosts2 } from "@shared/entities/cost-inputs/data-collection-and-field-costs.entity.js";
-import { CarbonStandardFees2 } from "@shared/entities/cost-inputs/carbon-standard-fees.entity.js";
-import { CommunityBenefitSharingFund2 } from "@shared/entities/cost-inputs/community-benefit-sharing-fund.entity.js";
-import { CommunityCashFlow2 } from "@shared/entities/cost-inputs/community-cash-flow.entity.js";
-import { CommunityRepresentation2 } from "@shared/entities/cost-inputs/community-representation.entity.js";
-import { EcosystemLoss2 } from "@shared/entities/carbon-inputs/ecosystem-loss.entity.js";
-import { CarbonRights2 } from "@shared/entities/cost-inputs/establishing-carbon-rights.entity.js";
-import { FinancingCost2 } from "@shared/entities/cost-inputs/financing-cost.entity.js";
-import { Maintenance2 } from "@shared/entities/cost-inputs/maintenance.entity.js";
-import { MonitoringCost2 } from "@shared/entities/cost-inputs/monitoring.entity.js";
-import { RestorableLand2 } from "@shared/entities/carbon-inputs/restorable-land.entity.js";
-import { ValidationCost2 } from "@shared/entities/cost-inputs/validation.entity.js";
-import { BaselineReassessment2 } from "@shared/entities/cost-inputs/baseline-reassessment.entity.js";
-import { BlueCarbonProjectPlanning2 } from "@shared/entities/cost-inputs/blue-carbon-project-planning.entity.js";
-import { EmissionFactors2 } from "@shared/entities/carbon-inputs/emission-factors.entity.js";
-import { LongTermProjectOperating2 } from "@shared/entities/cost-inputs/long-term-project-operating.entity.js";
-import { MRV2 } from "@shared/entities/cost-inputs/mrv.entity.js";
-import { SequestrationRate2 } from "@shared/entities/carbon-inputs/sequestration-rate.entity.js";
-import { EcosystemExtent2 } from "@shared/entities/carbon-inputs/ecosystem-extent.entity.js";
 import { BaseDataView } from "@shared/entities/base-data.view.js";
+import { EcosystemExtent } from "@shared/entities/carbon-inputs/ecosystem-extent.entity.js";
+import { EcosystemLoss } from "@shared/entities/carbon-inputs/ecosystem-loss.entity.js";
+import { EmissionFactors } from "@shared/entities/carbon-inputs/emission-factors.entity.js";
+import { RestorableLand } from "@shared/entities/carbon-inputs/restorable-land.entity.js";
+import { SequestrationRate } from "@shared/entities/carbon-inputs/sequestration-rate.entity.js";
+import { BaselineReassessment } from "@shared/entities/cost-inputs/baseline-reassessment.entity.js";
+import { BlueCarbonProjectPlanning } from "@shared/entities/cost-inputs/blue-carbon-project-planning.entity.js";
+import { CarbonStandardFees } from "@shared/entities/cost-inputs/carbon-standard-fees.entity.js";
+import { CommunityBenefitSharingFund } from "@shared/entities/cost-inputs/community-benefit-sharing-fund.entity.js";
+import { CommunityCashFlow } from "@shared/entities/cost-inputs/community-cash-flow.entity.js";
+import { CommunityRepresentation } from "@shared/entities/cost-inputs/community-representation.entity.js";
+import { ConservationPlanningAndAdmin } from "@shared/entities/cost-inputs/conservation-and-planning-admin.entity.js";
+import { DataCollectionAndFieldCosts } from "@shared/entities/cost-inputs/data-collection-and-field-costs.entity.js";
+import { CarbonRights } from "@shared/entities/cost-inputs/establishing-carbon-rights.entity.js";
+import { FeasibilityAnalysis } from "@shared/entities/cost-inputs/feasability-analysis.entity.js";
+import { FinancingCost } from "@shared/entities/cost-inputs/financing-cost.entity.js";
+import { LongTermProjectOperating } from "@shared/entities/cost-inputs/long-term-project-operating.entity.js";
+import { Maintenance } from "@shared/entities/cost-inputs/maintenance.entity.js";
+import { MonitoringCost } from "@shared/entities/cost-inputs/monitoring.entity.js";
+import { MRV } from "@shared/entities/cost-inputs/mrv.entity.js";
+import { ProjectSize } from "@shared/entities/cost-inputs/project-size.entity.js";
+import { ValidationCost } from "@shared/entities/cost-inputs/validation.entity.js";
 
 // 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,
-  ProjectSize2,
-  FeasibilityAnalysis2,
-  ConservationPlanningAndAdmin2,
-  DataCollectionAndFieldCosts2,
-  CarbonStandardFees2,
-  CommunityBenefitSharingFund2,
-  CommunityCashFlow2,
-  CommunityRepresentation2,
-  EcosystemLoss2,
-  CarbonRights2,
-  FinancingCost2,
-  Maintenance2,
-  MonitoringCost2,
-  RestorableLand2,
-  ValidationCost2,
-  BaselineReassessment2,
-  BlueCarbonProjectPlanning2,
-  EmissionFactors2,
-  LongTermProjectOperating2,
-  MRV2,
-  SequestrationRate2,
+  ProjectSize,
+  FeasibilityAnalysis,
+  ConservationPlanningAndAdmin,
+  DataCollectionAndFieldCosts,
+  CarbonStandardFees,
+  CommunityBenefitSharingFund,
+  CommunityCashFlow,
+  CommunityRepresentation,
+  EcosystemLoss,
+  CarbonRights,
+  FinancingCost,
+  Maintenance,
+  MonitoringCost,
+  RestorableLand,
+  ValidationCost,
+  BaselineReassessment,
+  BlueCarbonProjectPlanning,
+  EmissionFactors,
+  LongTermProjectOperating,
+  MRV,
+  SequestrationRate,
+  EcosystemExtent,
   Project,
-  EcosystemExtent2,
   BaseDataView,
 ];
 

admin/resources/baseline-reassesment/baseline-reassesment.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { BaselineReassessment2 } from "@shared/entities/cost-inputs/baseline-reassessment.entity.js";
+import { BaselineReassessment } from "@shared/entities/cost-inputs/baseline-reassessment.entity.js";
 
 export const BaselineReassessmentResource: ResourceWithOptions = {
-  resource: BaselineReassessment2,
+  resource: BaselineReassessment,
   options: {
     sort: {
       sortBy: "baselineReassessmentCost",

admin/resources/blue-carbon-project-planning/blue-carbon-project-planning.resource.ts

@@ -1,8 +1,8 @@
-import { BlueCarbonProjectPlanning2 } from "@shared/entities/cost-inputs/blue-carbon-project-planning.entity.js";
+import { BlueCarbonProjectPlanning } from "@shared/entities/cost-inputs/blue-carbon-project-planning.entity.js";
 import { ResourceWithOptions } from "adminjs";
 
 export const BlueCarbonProjectPlanningResource: ResourceWithOptions = {
-  resource: BlueCarbonProjectPlanning2,
+  resource: BlueCarbonProjectPlanning,
   options: {
     properties: {
       id: {

admin/resources/carbon-estandard-fees/carbon-estandard-fees.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { CarbonStandardFees2 } from "@shared/entities/cost-inputs/carbon-standard-fees.entity.js";
+import { CarbonStandardFees } from "@shared/entities/cost-inputs/carbon-standard-fees.entity.js";
 
 export const CarbonStandardFeesResource: ResourceWithOptions = {
-  resource: CarbonStandardFees2,
+  resource: CarbonStandardFees,
   options: {
     sort: {
       sortBy: "carbonStandardFee",

admin/resources/carbon-righs/carbon-rights.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { CarbonRights2 } from "@shared/entities/cost-inputs/establishing-carbon-rights.entity.js";
+import { CarbonRights } from "@shared/entities/cost-inputs/establishing-carbon-rights.entity.js";
 
 export const CarbonRightsResource: ResourceWithOptions = {
-  resource: CarbonRights2,
+  resource: CarbonRights,
   options: {
     sort: {
       sortBy: "carbonRightsCost",

admin/resources/community-benefit/community-benefit.resource.ts

@@ -1,8 +1,8 @@
-import { CommunityBenefitSharingFund2 } from "@shared/entities/cost-inputs/community-benefit-sharing-fund.entity.js";
+import { CommunityBenefitSharingFund } from "@shared/entities/cost-inputs/community-benefit-sharing-fund.entity.js";
 import { ResourceWithOptions } from "adminjs";
 
 export const CommunityBenefitResource: ResourceWithOptions = {
-  resource: CommunityBenefitSharingFund2,
+  resource: CommunityBenefitSharingFund,
   options: {
     sort: {
       sortBy: "communityBenefitSharingFund",

admin/resources/community-cash-flow/community-cash-flow.resource.ts

@@ -1,8 +1,8 @@
-import { CommunityCashFlow2 } from "@shared/entities/cost-inputs/community-cash-flow.entity.js";
+import { CommunityCashFlow } from "@shared/entities/cost-inputs/community-cash-flow.entity.js";
 import { ResourceWithOptions } from "adminjs";
 
 export const CommunityCashFlowResource: ResourceWithOptions = {
-  resource: CommunityCashFlow2,
+  resource: CommunityCashFlow,
   options: {
     sort: {
       sortBy: "cashflowType",

admin/resources/community-representation/community-representation.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { CommunityRepresentation2 } from "@shared/entities/cost-inputs/community-representation.entity.js";
+import { CommunityRepresentation } from "@shared/entities/cost-inputs/community-representation.entity.js";
 
 export const CommunityRepresentationResource: ResourceWithOptions = {
-  resource: CommunityRepresentation2,
+  resource: CommunityRepresentation,
   options: {
     sort: {
       sortBy: "liaisonCost",

admin/resources/conservation-and-planning-admin/conservation-and-planning-admin.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { ConservationPlanningAndAdmin2 } from "@shared/entities/cost-inputs/conservation-and-planning-admin.entity.js";
+import { ConservationPlanningAndAdmin } from "@shared/entities/cost-inputs/conservation-and-planning-admin.entity.js";
 
 export const ConservationAndPlanningAdminResource: ResourceWithOptions = {
-  resource: ConservationPlanningAndAdmin2,
+  resource: ConservationPlanningAndAdmin,
   options: {
     sort: {
       sortBy: "planningCost",

admin/resources/data-collection-and-field-cost/data-collection-and-field-cost.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { DataCollectionAndFieldCosts2 } from "@shared/entities/cost-inputs/data-collection-and-field-costs.entity.js";
+import { DataCollectionAndFieldCosts } from "@shared/entities/cost-inputs/data-collection-and-field-costs.entity.js";
 
 export const DataCollectionAndFieldCostResource: ResourceWithOptions = {
-  resource: DataCollectionAndFieldCosts2,
+  resource: DataCollectionAndFieldCosts,
   options: {
     sort: {
       sortBy: "fieldCost",

admin/resources/ecosystem-loss/ecosystem-loss.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { EcosystemLoss2 } from "@shared/entities/carbon-inputs/ecosystem-loss.entity.js";
+import { EcosystemLoss } from "@shared/entities/carbon-inputs/ecosystem-loss.entity.js";
 
 export const EcosystemLossResource: ResourceWithOptions = {
-  resource: EcosystemLoss2,
+  resource: EcosystemLoss,
   options: {
     sort: {
       sortBy: "ecosystemLossRate",

admin/resources/emission-factors/emission-factors.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { EmissionFactors2 } from "@shared/entities/carbon-inputs/emission-factors.entity.js";
+import { EmissionFactors } from "@shared/entities/carbon-inputs/emission-factors.entity.js";
 
 export const EmissionFactorsResource: ResourceWithOptions = {
-  resource: EmissionFactors2,
+  resource: EmissionFactors,
   options: {
     sort: {
       sortBy: "tierSelector",

admin/resources/feasability-analysis/feasability-analysis.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { FeasibilityAnalysis2 } from "@shared/entities/cost-inputs/feasability-analysis.entity.js";
+import { FeasibilityAnalysis } from "@shared/entities/cost-inputs/feasability-analysis.entity.js";
 
 export const FeasibilityAnalysisResource: ResourceWithOptions = {
-  resource: FeasibilityAnalysis2,
+  resource: FeasibilityAnalysis,
   options: {
     sort: {
       sortBy: "analysisCost",

admin/resources/financing-cost/financing-cost.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { FinancingCost2 } from "@shared/entities/cost-inputs/financing-cost.entity.js";
+import { FinancingCost } from "@shared/entities/cost-inputs/financing-cost.entity.js";
 
 export const FinancingCostResource: ResourceWithOptions = {
-  resource: FinancingCost2,
+  resource: FinancingCost,
   options: {
     sort: {
       sortBy: "financingCostCapexPercent",

admin/resources/long-term-project-operating/long-term-project-operating.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { LongTermProjectOperating2 } from "@shared/entities/cost-inputs/long-term-project-operating.entity.js";
+import { LongTermProjectOperating } from "@shared/entities/cost-inputs/long-term-project-operating.entity.js";
 
 export const LongTermProjectOperatingResource: ResourceWithOptions = {
-  resource: LongTermProjectOperating2,
+  resource: LongTermProjectOperating,
   options: {
     sort: {
       sortBy: "longTermProjectOperatingCost",

admin/resources/maintenance/maintenance.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { Maintenance2 } from "@shared/entities/cost-inputs/maintenance.entity.js";
+import { Maintenance } from "@shared/entities/cost-inputs/maintenance.entity.js";
 
 export const MaintenanceResource: ResourceWithOptions = {
-  resource: Maintenance2,
+  resource: Maintenance,
   options: {
     sort: {
       sortBy: "maintenanceCost",

admin/resources/monitoring-cost/monitoring-cost.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { MonitoringCost2 } from "@shared/entities/cost-inputs/monitoring.entity.js";
+import { MonitoringCost } from "@shared/entities/cost-inputs/monitoring.entity.js";
 
 export const MonitoringCostResource: ResourceWithOptions = {
-  resource: MonitoringCost2,
+  resource: MonitoringCost,
   options: {
     sort: {
       sortBy: "monitoringCost",

admin/resources/mrv/mrv.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { MRV2 } from "@shared/entities/cost-inputs/mrv.entity.js";
+import { MRV } from "@shared/entities/cost-inputs/mrv.entity.js";
 
 export const MRVResource: ResourceWithOptions = {
-  resource: MRV2,
+  resource: MRV,
   options: {
     sort: {
       sortBy: "mrvCost",

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

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { ProjectSize2 } from "@shared/entities/cost-inputs/project-size.entity.js";
+import { ProjectSize } from "@shared/entities/cost-inputs/project-size.entity.js";
 
 export const ProjectSizeResource: ResourceWithOptions = {
-  resource: ProjectSize2,
+  resource: ProjectSize,
   options: {
     properties: {
       id: {

admin/resources/restorable-land/restorable-land.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { RestorableLand2 } from "@shared/entities/carbon-inputs/restorable-land.entity.js";
+import { RestorableLand } from "@shared/entities/carbon-inputs/restorable-land.entity.js";
 
 export const RestorableLandResource: ResourceWithOptions = {
-  resource: RestorableLand2,
+  resource: RestorableLand,
   options: {
     sort: {
       sortBy: "restorableLand",

admin/resources/sequestration-rate/sequestration-rate.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { SequestrationRate2 } from "@shared/entities/carbon-inputs/sequestration-rate.entity.js";
+import { SequestrationRate } from "@shared/entities/carbon-inputs/sequestration-rate.entity.js";
 
 export const SequestrationRateResource: ResourceWithOptions = {
-  resource: SequestrationRate2,
+  resource: SequestrationRate,
   options: {
     sort: {
       sortBy: "tierSelector",

admin/resources/validation-cost/validation-cost.resource.ts

@@ -1,8 +1,8 @@
 import { ResourceWithOptions } from "adminjs";
-import { ValidationCost2 } from "@shared/entities/cost-inputs/validation.entity.js";
+import { ValidationCost } from "@shared/entities/cost-inputs/validation.entity.js";
 
 export const ValidationCostResource: ResourceWithOptions = {
-  resource: ValidationCost2,
+  resource: ValidationCost,
   options: {
     sort: {
       sortBy: "validationCost",