Fix opportunity relation (#3478)

* Fix opportunity relation

* Fix

* Fix

* Fix tests

* Fix

* Fix

packages/twenty-server/src/database/typeorm-seeds/workspace/opportunity.ts

@@ -11,59 +11,59 @@ export const seedOpportunity = async (
     .insert()
     .into(`${schemaName}.${tableName}`, [
       'id',
+      'name',
       'amountAmountMicros',
       'amountCurrencyCode',
       'closeDate',
       'probability',
       'pipelineStepId',
       'pointOfContactId',
-      'personId',
       'companyId',
     ])
     .orIgnore()
     .values([
       {
         id: '7c887ee3-be10-412b-a663-16bd3c2228e1',
+        name: 'Opportunity 1',
         amountAmountMicros: 100000,
         amountCurrencyCode: 'USD',
         closeDate: new Date(),
         probability: 0.5,
         pipelineStepId: '6edf4ead-006a-46e1-9c6d-228f1d0143c9',
         pointOfContactId: '86083141-1c0e-494c-a1b6-85b1c6fefaa5',
-        personId: '86083141-1c0e-494c-a1b6-85b1c6fefaa5',
         companyId: 'fe256b39-3ec3-4fe3-8997-b76aa0bfa408',
       },
       {
         id: '53f66647-0543-4cc2-9f96-95cc699960f2',
+        name: 'Opportunity 2',
         amountAmountMicros: 2000000,
         amountCurrencyCode: 'USD',
         closeDate: new Date(),
         probability: 0.5,
         pipelineStepId: 'd8361722-03fb-4e65-bd4f-ec9e52e5ec0a',
         pointOfContactId: '93c72d2e-f517-42fd-80ae-14173b3b70ae',
-        personId: '93c72d2e-f517-42fd-80ae-14173b3b70ae',
         companyId: '118995f3-5d81-46d6-bf83-f7fd33ea6102',
       },
       {
         id: '81ab695d-2f89-406f-90ea-180f433b2445',
+        name: 'Opportunity 3',
         amountAmountMicros: 300000,
         amountCurrencyCode: 'USD',
         closeDate: new Date(),
         probability: 0.5,
         pipelineStepId: '30b14887-d592-427d-bd97-6e670158db02',
         pointOfContactId: '9b324a88-6784-4449-afdf-dc62cb8702f2',
-        personId: '9b324a88-6784-4449-afdf-dc62cb8702f2',
         companyId: '460b6fb1-ed89-413a-b31a-962986e67bb4',
       },
       {
         id: '9b059852-35b1-4045-9cde-42f715148954',
+        name: 'Opportunity 4',
         amountAmountMicros: 4000000,
         amountCurrencyCode: 'USD',
         closeDate: new Date(),
         probability: 0.5,
         pipelineStepId: '30b14887-d592-427d-bd97-6e670158db02',
         pointOfContactId: '98406e26-80f1-4dff-b570-a74942528de3',
-        personId: '98406e26-80f1-4dff-b570-a74942528de3',
         companyId: '460b6fb1-ed89-413a-b31a-962986e67bb4',
       },
     ])

packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata.ts

@@ -6,6 +6,7 @@ import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators
 import { ActivityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata';
 import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { CompanyObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/company.object-metadata';
+import { OpportunityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata';
 import { PersonObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata';
 
 @ObjectMetadata({
@@ -46,4 +47,14 @@ export class ActivityTargetObjectMetadata extends BaseObjectMetadata {
   })
   @IsNullable()
   company: CompanyObjectMetadata;
+
+  @FieldMetadata({
+    type: FieldMetadataType.RELATION,
+    label: 'Opportunity',
+    description: 'ActivityTarget opportunity',
+    icon: 'IconTargetArrow',
+    joinColumn: 'opportunityId',
+  })
+  @IsNullable()
+  opportunity: OpportunityObjectMetadata;
 }

packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata.ts

@@ -1,8 +1,11 @@
 import { CurrencyMetadata } from 'src/metadata/field-metadata/composite-types/currency.composite-type';
 import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
+import { RelationMetadataType } from 'src/metadata/relation-metadata/relation-metadata.entity';
 import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
 import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
 import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { RelationMetadata } from 'src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator';
+import { ActivityTargetObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata';
 import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { CompanyObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/company.object-metadata';
 import { PersonObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata';
@@ -16,6 +19,14 @@ import { PipelineStepObjectMetadata } from 'src/workspace/workspace-sync-metadat
   icon: 'IconTargetArrow',
 })
 export class OpportunityObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    type: FieldMetadataType.TEXT,
+    label: 'Name',
+    description: 'The opportunity name',
+    icon: 'IconTargetArrow',
+  })
+  name: string;
+
   @FieldMetadata({
     type: FieldMetadataType.CURRENCY,
     label: 'Amount',
@@ -65,16 +76,6 @@ export class OpportunityObjectMetadata extends BaseObjectMetadata {
   @IsNullable()
   pointOfContact: PersonObjectMetadata;
 
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Person',
-    description: 'Opportunity person',
-    icon: 'IconUser',
-    joinColumn: 'personId',
-  })
-  @IsNullable()
-  person: PersonObjectMetadata;
-
   @FieldMetadata({
     type: FieldMetadataType.RELATION,
     label: 'Company',
@@ -84,4 +85,17 @@ export class OpportunityObjectMetadata extends BaseObjectMetadata {
   })
   @IsNullable()
   company: CompanyObjectMetadata;
+
+  @FieldMetadata({
+    type: FieldMetadataType.RELATION,
+    label: 'Activities',
+    description: 'Activities tied to the opportunity',
+    icon: 'IconCheckbox',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    objectName: 'activityTarget',
+  })
+  @IsNullable()
+  activityTargets: ActivityTargetObjectMetadata[];
 }

packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata.ts

@@ -135,19 +135,6 @@ export class PersonObjectMetadata extends BaseObjectMetadata {
   @IsNullable()
   activityTargets: ActivityTargetObjectMetadata[];
 
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Opportunities',
-    description: 'Opportunities linked to the contact.',
-    icon: 'IconTargetArrow',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'opportunity',
-  })
-  @IsNullable()
-  opportunities: OpportunityObjectMetadata[];
-
   @FieldMetadata({
     type: FieldMetadataType.RELATION,
     label: 'Favorites',