Refactor multiple models to remove foreign key references while maintaining required fields, enhancing data integrity and simplifying model definitions.

2025-12-18 16:08:30 +01:00
parent c66fbf1a62
commit c8072b8052
24 changed files with 38 additions and 222 deletions
--- a/backend/models/falukant/data/production.js
+++ b/backend/models/falukant/data/production.js
@@ -17,11 +17,6 @@ Production.init({
    weatherTypeId: {
        type: DataTypes.INTEGER,
        allowNull: true,
-        references: {
-            model: WeatherType,
-            key: 'id',
-            schema: 'falukant_type'
-        },
        comment: 'Wetter zum Zeitpunkt der Produktionserstellung'
    },
    startTimestamp: {
--- a/backend/models/falukant/data/region.js
+++ b/backend/models/falukant/data/region.js
@@ -10,20 +10,11 @@ RegionData.init({
        allowNull: false},
    regionTypeId: {
        type: DataTypes.INTEGER,
-        allowNull: false,
-        references: {
-            model: RegionType,
-            key: 'id',
-            schema: 'falukant_type'
-        }
+        allowNull: false
    },
    parentId: {
        type: DataTypes.INTEGER,
-        allowNull: true,
-        references: {
-            model: 'region',
-            key: 'id',
-            schema: 'falukant_data'}
+        allowNull: true
    },
    map: {
        type: DataTypes.JSONB,
--- a/backend/models/falukant/data/region_distance.js
+++ b/backend/models/falukant/data/region_distance.js
@@ -8,21 +8,11 @@ RegionDistance.init(
  {
    sourceRegionId: {
      type: DataTypes.INTEGER,
-      allowNull: false,
-      references: {
-        model: RegionData,
-        key: 'id',
-        schema: 'falukant_data',
-      },
+      allowNull: false
    },
    targetRegionId: {
      type: DataTypes.INTEGER,
-      allowNull: false,
-      references: {
-        model: RegionData,
-        key: 'id',
-        schema: 'falukant_data',
-      },
+      allowNull: false
    },
    transportMode: {
      // e.g. 'land', 'water', 'air' – should match VehicleType.transportMode
--- a/backend/models/falukant/data/relationship.js
+++ b/backend/models/falukant/data/relationship.js
@@ -8,18 +8,10 @@ Relationship.init(
  {
    character1Id: {
      type: DataTypes.INTEGER,
-      allowNull: false,
-      references: {
-        model: FalukantCharacter,
-        key: 'id'},
-      onDelete: 'CASCADE'},
+      allowNull: false},
    character2Id: {
      type: DataTypes.INTEGER,
-      allowNull: false,
-      references: {
-        model: FalukantCharacter,
-        key: 'id'},
-      onDelete: 'CASCADE'},
+      allowNull: false},
    relationshipTypeId: {
      type: DataTypes.INTEGER,
      allowNull: false,
--- a/backend/models/falukant/data/user.js
+++ b/backend/models/falukant/data/user.js
@@ -8,13 +8,6 @@ FalukantUser.init({
    userId: {
        type: DataTypes.INTEGER,
        allowNull: false,
-        references: {
-            model: {
-                tableName: 'user',
-                schema: 'community' 
-            },
-            key: 'id'
-        },
        unique: true},
    money: {
        type: DataTypes.DECIMAL(10, 2),
@@ -38,12 +31,7 @@ FalukantUser.init({
        defaultValue: 1},
    mainBranchRegionId: {
        type: DataTypes.INTEGER,
-        allowNull: true,
-        references: {
-            model: RegionData,
-            key: 'id',
-            schema: 'falukant_data'
-        }
+        allowNull: true
    },
    lastNobilityAdvanceAt: {
        type: DataTypes.DATE,
--- a/backend/models/falukant/data/weather.js
+++ b/backend/models/falukant/data/weather.js
@@ -10,21 +10,11 @@ Weather.init(
    regionId: {
      type: DataTypes.INTEGER,
      primaryKey: true,
-      allowNull: false,
-      references: {
-        model: RegionData,
-        key: 'id',
-        schema: 'falukant_data'
-      }
+      allowNull: false
    },
    weatherTypeId: {
      type: DataTypes.INTEGER,
-      allowNull: false,
-      references: {
-        model: WeatherType,
-        key: 'id',
-        schema: 'falukant_type'
-      }
+      allowNull: false
    }
  },
  {
--- a/backend/models/falukant/predefine/promotional_gift_character_trait.js
+++ b/backend/models/falukant/predefine/promotional_gift_character_trait.js
@@ -10,13 +10,11 @@ PromotionalGiftCharacterTrait.init(
    giftId: {
      type: DataTypes.INTEGER,
      field: 'gift_id',
-      references: { model: PromotionalGift, key: 'id' },
      allowNull: false
    },
    traitId: {
      type: DataTypes.INTEGER,
      field: 'trait_id',
-      references: { model: CharacterTrait, key: 'id' },
      allowNull: false
    },
    suitability: {
--- a/backend/models/falukant/predefine/promotional_gift_mood.js
+++ b/backend/models/falukant/predefine/promotional_gift_mood.js
@@ -10,19 +10,11 @@ PromotionalGiftMood.init(
    giftId: {
      type: DataTypes.INTEGER,
      field: 'gift_id',
-      references: {
-        model: PromotionalGift,
-        key: 'id'
-      },
      allowNull: false
    },
    moodId: {
      type: DataTypes.INTEGER,
      field: 'mood_id',
-      references: {
-        model: Mood,
-        key: 'id'
-      },
      allowNull: false
    },
    suitability: {
--- a/backend/models/falukant/type/product_weather_effect.js
+++ b/backend/models/falukant/type/product_weather_effect.js
@@ -9,21 +9,11 @@ ProductWeatherEffect.init(
  {
    productId: {
      type: DataTypes.INTEGER,
-      allowNull: false,
-      references: {
-        model: ProductType,
-        key: 'id',
-        schema: 'falukant_type'
-      }
+      allowNull: false
    },
    weatherTypeId: {
      type: DataTypes.INTEGER,
-      allowNull: false,
-      references: {
-        model: WeatherType,
-        key: 'id',
-        schema: 'falukant_type'
-      }
+      allowNull: false
    },
    qualityEffect: {
      type: DataTypes.INTEGER,
--- a/backend/models/falukant/type/region.js
+++ b/backend/models/falukant/type/region.js
@@ -9,11 +9,7 @@ RegionType.init({
        allowNull: false},
    parentId: {
        type: DataTypes.INTEGER,
-        allowNull: true,
-        references: {
-            model: 'region',
-            key: 'id',
-            schema: 'falukant_type'}
+        allowNull: true
    }
 }, {
    sequelize,