Merge pull request #58 from feminizidmap/change_field_types

Change field types, close #45
feminizidmap · Nov 25, 2024 · ecaf85b · ecaf85b
2 parents c20a5e2 + c183a91
commit ecaf85b
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 41 deletions.
diff --git a/src/api/case/content-types/case/schema.json b/src/api/case/content-types/case/schema.json
@@ -98,6 +98,16 @@
     },
     "report_of_crime_details": {
       "type": "string"
+    },
+    "authorities_involved": {
+      "type": "component",
+      "repeatable": true,
+      "component": "comments.comments"
+    },
+    "media_labels_used": {
+      "type": "component",
+      "repeatable": true,
+      "component": "comments.comments"
     }
   }
 }
diff --git a/src/components/comments/comments.json b/src/components/comments/comments.json
@@ -2,12 +2,13 @@
   "collectionName": "components_comments_comments",
   "info": {
     "displayName": "comments",
-    "icon": "feather"
+    "icon": "feather",
+    "description": ""
   },
   "options": {},
   "attributes": {
     "comment": {
-      "type": "text",
+      "type": "string",
       "private": true
     }
   }

diff --git a/src/components/crime/crime.json b/src/components/crime/crime.json
@@ -22,15 +22,15 @@
     },
     "weapons": {
       "type": "relation",
-      "relation": "oneToOne",
+      "relation": "oneToMany",
       "target": "api::weapon.weapon"
     },
     "weapon_details": {
       "type": "string"
     },
     "motives": {
       "type": "relation",
-      "relation": "oneToOne",
+      "relation": "oneToMany",
       "target": "api::dropdown-motive.dropdown-motive"
     },
     "motive_details": {

diff --git a/src/components/perpretrator/perpetrator.json b/src/components/perpretrator/perpetrator.json
@@ -121,12 +121,6 @@
       "type": "text",
       "private": true
     },
-    "migration_background": {
-      "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::dropdown-general-option.dropdown-general-option",
-      "private": true
-    },
     "citizenship_details": {
       "type": "text",
       "private": true

diff --git a/src/components/survived-by/survived-by.json b/src/components/survived-by/survived-by.json
@@ -0,0 +1,21 @@
+{
+  "collectionName": "components_survived_by_survived_bies",
+  "info": {
+    "displayName": "survived_by",
+    "description": ""
+  },
+  "options": {},
+  "attributes": {
+    "dropdown_hinterbliebene": {
+      "type": "relation",
+      "relation": "oneToOne",
+      "target": "api::dropdown-surviving-dependent.dropdown-surviving-dependent"
+    },
+    "age": {
+      "type": "integer"
+    },
+    "relation_details": {
+      "type": "string"
+    }
+  }
+}
diff --git a/src/components/victim/victim.json b/src/components/victim/victim.json
@@ -68,11 +68,6 @@
       "relation": "oneToOne",
       "target": "api::dropdown-general-option.dropdown-general-option"
     },
-    "survived_by": {
-      "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::dropdown-general-option.dropdown-general-option"
-    },
     "survived_by_details": {
       "type": "string"
     },
@@ -95,12 +90,6 @@
       "relation": "oneToOne",
       "target": "api::feminicide-type.feminicide-type"
     },
-    "migration_background": {
-      "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::dropdown-general-option.dropdown-general-option",
-      "private": true
-    },
     "citizenship_details": {
       "type": "text",
       "private": true
@@ -115,6 +104,11 @@
     },
     "type_of_feminicide_details": {
       "type": "string"
+    },
+    "survived_by": {
+      "type": "component",
+      "repeatable": true,
+      "component": "survived-by.survived-by"
     }
   }
 }
diff --git a/types/generated/components.d.ts b/types/generated/components.d.ts
@@ -28,9 +28,10 @@ export interface CommentsComments extends Schema.Component {
   info: {
     displayName: 'comments';
     icon: 'feather';
+    description: '';
   };
   attributes: {
-    comment: Attribute.Text & Attribute.Private;
+    comment: Attribute.String & Attribute.Private;
   };
 }
 
@@ -55,13 +56,13 @@ export interface CrimeCrime extends Schema.Component {
     >;
     weapons: Attribute.Relation<
       'crime.crime',
-      'oneToOne',
+      'oneToMany',
       'api::weapon.weapon'
     >;
     weapon_details: Attribute.String;
     motives: Attribute.Relation<
       'crime.crime',
-      'oneToOne',
+      'oneToMany',
       'api::dropdown-motive.dropdown-motive'
     >;
     motive_details: Attribute.String;
@@ -178,12 +179,6 @@ export interface PerpretratorPerpetrator extends Schema.Component {
       'api::dropdown-general-option.dropdown-general-option'
     >;
     restraining_order_details: Attribute.Text & Attribute.Private;
-    migration_background: Attribute.Relation<
-      'perpretrator.perpetrator',
-      'oneToOne',
-      'api::dropdown-general-option.dropdown-general-option'
-    > &
-      Attribute.Private;
     citizenship_details: Attribute.Text & Attribute.Private;
     family_status_other: Attribute.String;
     gender_details: Attribute.String;
@@ -213,6 +208,23 @@ export interface SourceSource extends Schema.Component {
   };
 }
 
+export interface SurvivedBySurvivedBy extends Schema.Component {
+  collectionName: 'components_survived_by_survived_bies';
+  info: {
+    displayName: 'survived_by';
+    description: '';
+  };
+  attributes: {
+    dropdown_hinterbliebene: Attribute.Relation<
+      'survived-by.survived-by',
+      'oneToOne',
+      'api::dropdown-surviving-dependent.dropdown-surviving-dependent'
+    >;
+    age: Attribute.Integer;
+    relation_details: Attribute.String;
+  };
+}
+
 export interface VictimVictim extends Schema.Component {
   collectionName: 'components_victim_victims';
   info: {
@@ -268,11 +280,6 @@ export interface VictimVictim extends Schema.Component {
       'oneToOne',
       'api::dropdown-general-option.dropdown-general-option'
     >;
-    survived_by: Attribute.Relation<
-      'victim.victim',
-      'oneToOne',
-      'api::dropdown-general-option.dropdown-general-option'
-    >;
     survived_by_details: Attribute.String;
     address: Attribute.Component<'adresse.adresse'>;
     citizenship: Attribute.String &
@@ -287,12 +294,6 @@ export interface VictimVictim extends Schema.Component {
       'oneToOne',
       'api::feminicide-type.feminicide-type'
     >;
-    migration_background: Attribute.Relation<
-      'victim.victim',
-      'oneToOne',
-      'api::dropdown-general-option.dropdown-general-option'
-    > &
-      Attribute.Private;
     citizenship_details: Attribute.Text & Attribute.Private;
     surviving_dependents: Attribute.Relation<
       'victim.victim',
@@ -301,6 +302,7 @@ export interface VictimVictim extends Schema.Component {
     >;
     family_status_other: Attribute.String;
     type_of_feminicide_details: Attribute.String;
+    survived_by: Attribute.Component<'survived-by.survived-by', true>;
   };
 }
 
@@ -312,6 +314,7 @@ declare module '@strapi/types' {
       'crime.crime': CrimeCrime;
       'perpretrator.perpetrator': PerpretratorPerpetrator;
       'source.source': SourceSource;
+      'survived-by.survived-by': SurvivedBySurvivedBy;
       'victim.victim': VictimVictim;
     }
   }

diff --git a/types/generated/contentTypes.d.ts b/types/generated/contentTypes.d.ts
@@ -867,6 +867,8 @@ export interface ApiCaseCase extends Schema.CollectionType {
       'api::notification.notification'
     >;
     report_of_crime_details: Attribute.String;
+    authorities_involved: Attribute.Component<'comments.comments', true>;
+    media_labels_used: Attribute.Component<'comments.comments', true>;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     publishedAt: Attribute.DateTime;