Some extensions and fixes

backend/models/associations.js

@@ -48,6 +48,17 @@ import BuyableStock from './falukant/data/buyable_stock.js';
 import MoneyFlow from './falukant/log/moneyflow.js';
 import Director from './falukant/data/director.js';
 import DirectorProposal from './falukant/data/director_proposal.js';
+import TownProductWorth from './falukant/data/town_product_worth.js';
+import DayProduction from './falukant/log/dayproduction.js';
+import DaySell from './falukant/log/daysell.js';
+import MarriageProposal from './falukant/data/marriage_proposal.js';
+import Notification from './falukant/log/notification';
+import CharacterTrait from './falukant/type/character_trait.js';
+import FalukantCharacterTrait from './falukant/data/falukant_character_trait.js';
+import Mood from './falukant/type/mood.js';
+import PromotionalGift from './falukant/type/promotional_gift.js';
+import PromotionalGiftCharacterTrait from './falukant/predefine/promotional_gift_character_trait.js';
+import PromotionalGiftMood from './falukant/predefine/promotional_gift_mood.js';
 
 export default function setupAssociations() {
     // UserParam related associations
@@ -270,4 +281,49 @@ export default function setupAssociations() {
 
     DirectorProposal.belongsTo(FalukantCharacter, { foreignKey: 'directorCharacterId', as: 'character' });
     FalukantCharacter.hasMany(DirectorProposal, { foreignKey: 'directorCharacterId', as: 'directorProposals' });
+
+    TownProductWorth.belongsTo(ProductType, { foreignKey: 'productId', as: 'productType' });
+    ProductType.hasMany(TownProductWorth, { foreignKey: 'productId', as: 'townProductWorths' });
+
+    TownProductWorth.belongsTo(RegionData, { foreignKey: 'regionId', as: 'region' });
+    RegionData.hasMany(TownProductWorth, { foreignKey: 'regionId', as: 'townProductWorths' });
+
+    DayProduction.belongsTo(ProductType, { foreignKey: 'productId', as: 'productType' });
+    ProductType.hasMany(DayProduction, { foreignKey: 'productId', as: 'dayProductions' });
+
+    DayProduction.belongsTo(RegionData, { foreignKey: 'regionId', as: 'region' });
+    RegionData.hasMany(DayProduction, { foreignKey: 'regionId', as: 'dayProductions' });
+
+    DayProduction.belongsTo(FalukantUser, { foreignKey: 'producerId', as: 'user' });
+    FalukantUser.hasMany(DayProduction, { foreignKey: 'producerId', as: 'dayProductions' });
+
+    DaySell.belongsTo(ProductType, { foreignKey: 'productId', as: 'productType' });
+    ProductType.hasMany(DaySell, { foreignKey: 'productId', as: 'daySells' });
+
+    DaySell.belongsTo(RegionData, { foreignKey: 'regionId', as: 'region' });
+    RegionData.hasMany(DaySell, { foreignKey: 'regionId', as: 'daySells' });
+
+    DaySell.belongsTo(FalukantUser, { foreignKey: 'sellerId', as: 'user' });
+    FalukantUser.hasMany(DaySell, { foreignKey: 'sellerId', as: 'daySells' });
+
+    Notification.belongsTo(FalukantUser, { foreignKey: 'userId', as: 'user' });
+    FalukantUser.hasMany(Notification, { foreignKey: 'userId', as: 'notifications' });
+
+    MarriageProposal.belongsTo(FalukantCharacter, {foreignKey: 'requesterCharacterId', as: 'requesterCharacter', });
+    FalukantCharacter.hasMany(MarriageProposal, { foreignKey: 'requesterCharacterId', as: 'initiatedProposals' });
+
+    MarriageProposal.belongsTo(FalukantCharacter, {foreignKey: 'proposedCharacterId', as: 'proposedCharacter', });
+    FalukantCharacter.hasMany(MarriageProposal, {foreignKey: 'proposedCharacterId', as: 'receivedProposals' });      
+    
+    FalukantCharacter.belongsToMany(CharacterTrait, {through: FalukantCharacterTrait, foreignKey: 'character_id', as: 'traits', });
+    CharacterTrait.belongsToMany(FalukantCharacter, {through: FalukantCharacterTrait, foreignKey: 'trait_id', as: 'characters', });
+    
+    Mood.hasMany(FalukantCharacter, {foreignKey: 'mood_id', as: 'moods'});
+    FalukantCharacter.belongsTo(Mood, {foreignKey: 'mood_id', as: 'mood'});
+    
+    PromotionalGift.belongsToMany(CharacterTrait, {through: PromotionalGiftCharacterTrait, foreignKey: 'gift_id', as: 'traits',});
+    CharacterTrait.belongsToMany(PromotionalGift, {through: PromotionalGiftCharacterTrait, foreignKey: 'trait_id', as: 'gifts',});
+
+    PromotionalGift.belongsToMany(Mood, {through: PromotionalGiftMood, foreignKey: 'gift_id', as: 'moods',});
+    Mood.belongsToMany(PromotionalGift, {through: PromotionalGiftMood, foreignKey: 'mood_id', as: 'gifts',});
 }

backend/models/falukant/data/character.js

@@ -1,49 +1,57 @@
 import { Model, DataTypes } from 'sequelize';
 import { sequelize } from '../../../utils/sequelize.js';
 
-class FalukantCharacter extends Model {};
+class FalukantCharacter extends Model {}
 
-FalukantCharacter.init({
-    userId: {
-        type: DataTypes.INTEGER,
-        allowNull: true,
+FalukantCharacter.init(
+  {
+    user_id: {
+      type: DataTypes.INTEGER,
+      allowNull: true,
     },
-    regionId: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
+    region_id: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
     },
-    firstName: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
+    first_name: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
     },
-    lastName: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
+    last_name: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
     },
     birthdate: {
-        type: DataTypes.DATE,
-        allowNull: false,
-        defaultValue: DataTypes.NOW
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: DataTypes.NOW,
     },
     gender: {
-        type: DataTypes.STRING
+      type: DataTypes.STRING,
     },
     health: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
-        defaultValue: 100
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      defaultValue: 100,
     },
     titleOfNobility: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
+      type: DataTypes.INTEGER,
+      allowNull: false,
+    },
+    moodId: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      defaultValue: 1,
     }
-}, {
+  },
+  {
     sequelize,
     modelName: 'FalukantCharacter',
     tableName: 'character',
     schema: 'falukant_data',
     timestamps: true,
     underscored: true,
-});
+  }
+);
 
 export default FalukantCharacter;

backend/models/falukant/data/falukant_character_trait.js

@@ -0,0 +1,27 @@
+import { Model, DataTypes } from 'sequelize';
+import { sequelize } from '../../../utils/sequelize.js';
+
+class FalukantCharacterTrait extends Model {}
+
+FalukantCharacterTrait.init(
+  {
+    character_id: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+    },
+    trait_id: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+    },
+  },
+  {
+    sequelize,
+    modelName: 'FalukantCharacterTrait',
+    tableName: 'falukant_character_trait',
+    schema: 'falukant_data',
+    timestamps: false,
+    underscored: true,
+  }
+);
+
+export default FalukantCharacterTrait;

backend/models/falukant/data/marriage_proposal.js

@@ -0,0 +1,34 @@
+import { Model, DataTypes } from 'sequelize';
+import { sequelize } from '../../../utils/sequelize.js';
+
+class MarriageProposal extends Model {}
+
+MarriageProposal.init(
+  {
+    requesterCharacterId: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      onDelete: 'CASCADE',
+    },
+    proposedCharacterId: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      onDelete: 'CASCADE',
+    },
+    cost: {
+      type: DataTypes.FLOAT,
+      allowNull: false,
+      defaultValue: 0,
+    },
+  },
+  {
+    sequelize,
+    modelName: 'MarriageProposal',
+    tableName: 'marriage_proposals',
+    schema: 'falukant_data',
+    timestamps: true, 
+    underscored: true,
+  }
+);
+
+export default MarriageProposal;

backend/models/falukant/data/production.js

@@ -19,7 +19,7 @@ Production.init({
     startTimestamp: {
         type: DataTypes.DATE,
         allowNull: false,
-        defaultValue: DataTypes.NOW,
+        defaultValue: sequelize.literal('CURRENT_TIMESTAMP'),
     }
 }, {
     sequelize,

backend/models/falukant/data/town_product_worth.js

@@ -0,0 +1,34 @@
+import { Model, DataTypes } from 'sequelize';
+import { sequelize } from '../../../utils/sequelize.js';
+
+class TownProductWorth extends Model { }
+
+TownProductWorth.init({
+    productId: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+    },
+    regionId: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+    },
+    worthPercent: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+        defaultValue: 0,
+    }
+}, {
+    sequelize,
+    modelName: 'TownProductWorth',
+    tableName: 'town_product_worth',
+    schema: 'falukant_data',
+    timestamps: false,
+    underscored: true,
+    hooks: {
+        beforeCreate: (worthPercent) => {
+            worthPercent.worthPercent = Math.floor(Math.random() * 20) + 40;
+        }
+    }
+});
+
+export default TownProductWorth;

backend/models/falukant/log/dayproduction.js

@@ -0,0 +1,44 @@
+import { Model, DataTypes } from 'sequelize';
+import { sequelize } from '../../../utils/sequelize.js';
+
+class DayProduction extends Model { }
+
+DayProduction.init({
+    regionId: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+    },
+    productId: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+    },
+    quantity: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+    },
+    producerId: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+    },
+    productionTimestamp: {
+        type: DataTypes.DATE,
+        allowNull: false,
+        defaultValue: sequelize.literal('CURRENT_TIMESTAMP'),
+    }
+}, {
+    sequelize,
+    modelName: 'DayProduction',
+    tableName: 'production',
+    schema: 'falukant_log',
+    timestamps: false,
+    underscored: true,
+    indexes: [
+        {
+            unique: true,
+            fields: ['producer_id', 'product_id', 'region_id']
+        }
+    ]
+
+});
+
+export default DayProduction;

backend/models/falukant/log/daysell.js

@@ -0,0 +1,43 @@
+import { Model, DataTypes } from 'sequelize';
+import { sequelize } from '../../../utils/sequelize.js';
+
+class DaySell extends Model { }
+
+DaySell.init({
+    regionId: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+    },
+    productId: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+    },
+    quantity: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+    },
+    sellerId: { 
+        type: DataTypes.INTEGER,
+        allowNull: false,
+    },
+    sellTimestamp: {
+        type: DataTypes.DATE,
+        allowNull: false,
+        defaultValue: sequelize.literal('CURRENT_TIMESTAMP'),
+    }
+}, {
+    sequelize,
+    modelName: 'DaySell',
+    tableName: 'sell',
+    schema: 'falukant_log',
+    timestamps: false,
+    underscored: true,
+    indexes: [
+        {
+            unique: true,
+            fields: ['seller_id', 'product_id', 'region_id']
+        }
+    ]
+});
+
+export default DaySell;

backend/models/falukant/log/notification

@@ -0,0 +1,29 @@
+import { Model, DataTypes } from 'sequelize';
+import { sequelize } from '../../../utils/sequelize.js';
+
+class Notification extends Model { }
+
+Notification.init({
+    userId: { 
+        type: DataTypes.INTEGER,
+        allowNull: false,
+    },
+    tr: {
+        type: DataTypes.STRING,
+        allowNull: false,
+    },
+    shown: {
+        type: DataTypes.BOOLEAN,
+        allowNull: false,
+        defaultValue: false,
+    },
+}, {
+    sequelize,
+    modelName: 'Notification',
+    tableName: 'notification',
+    schema: 'falukant_log',
+    timestamps: true,
+    underscored: true,
+});
+
+export default Notification;

backend/models/falukant/predefine/promotional_gift_character_trait.js

@@ -0,0 +1,45 @@
+import { Model, DataTypes } from 'sequelize';
+import { sequelize } from '../../../utils/sequelize.js';
+import PromotionalGift from '../type/promotional_gift.js';
+import CharacterTrait from '../type/character_trait.js';
+
+class PromotionalGiftCharacterTrait extends Model {}
+
+PromotionalGiftCharacterTrait.init(
+  {
+    gift_id: {
+      type: DataTypes.INTEGER,
+      references: {
+        model: PromotionalGift,
+        key: 'id',
+      },
+      allowNull: false,
+    },
+    trait_id: {
+      type: DataTypes.INTEGER,
+      references: {
+        model: CharacterTrait,
+        key: 'id',
+      },
+      allowNull: false,
+    },
+    suitability: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      validate: {
+        min: 1,
+        max: 5,
+      },
+    },
+  },
+  {
+    sequelize,
+    modelName: 'PromotionalGiftCharacterTrait',
+    tableName: 'promotional_gift_character_trait',
+    schema: 'falukant_predefine',
+    timestamps: false,
+    underscored: true,
+  }
+);
+
+export default PromotionalGiftCharacterTrait;

backend/models/falukant/predefine/promotional_gift_mood.js

@@ -0,0 +1,45 @@
+import { Model, DataTypes } from 'sequelize';
+import { sequelize } from '../../../utils/sequelize.js';
+import PromotionalGift from '../type/promotional_gift.js';
+import Mood from '../type/mood.js';
+
+class PromotionalGiftMood extends Model {}
+
+PromotionalGiftMood.init(
+  {
+    gift_id: {
+      type: DataTypes.INTEGER,
+      references: {
+        model: PromotionalGift,
+        key: 'id',
+      },
+      allowNull: false,
+    },
+    mood_id: {
+      type: DataTypes.INTEGER,
+      references: {
+        model: Mood,
+        key: 'id',
+      },
+      allowNull: false,
+    },
+    suitability: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      validate: {
+        min: 1,
+        max: 5,
+      },
+    },
+  },
+  {
+    sequelize,
+    modelName: 'PromotionalGiftMood',
+    tableName: 'promotional_gift_mood',
+    schema: 'falukant_predefine',
+    timestamps: false,
+    underscored: true,
+  }
+);
+
+export default PromotionalGiftMood;

backend/models/falukant/type/character_trait.js

@@ -0,0 +1,23 @@
+import { Model, DataTypes } from 'sequelize';
+import { sequelize } from '../../../utils/sequelize.js';
+
+class CharacterTrait extends Model {}
+
+CharacterTrait.init(
+  {
+    tr: {
+      type: DataTypes.STRING,
+      allowNull: false,
+    },
+  },
+  {
+    sequelize,
+    modelName: 'CharacterTrait',
+    tableName: 'character_trait',
+    schema: 'falukant_type',
+    timestamps: false,
+    underscored: true,
+  }
+);
+
+export default CharacterTrait;

backend/models/falukant/type/mood.js

@@ -0,0 +1,23 @@
+import { Model, DataTypes } from 'sequelize';
+import { sequelize } from '../../../utils/sequelize.js';
+
+class Mood extends Model {}
+
+Mood.init(
+  {
+    tr: {
+      type: DataTypes.STRING,
+      allowNull: false,
+    },
+  },
+  {
+    sequelize,
+    modelName: 'Mood',
+    tableName: 'mood',
+    schema: 'falukant_type',
+    timestamps: false,
+    underscored: true,
+  }
+);
+
+export default Mood;

backend/models/falukant/type/promotional_gift.js

@@ -0,0 +1,32 @@
+import { Model, DataTypes } from 'sequelize';
+import { sequelize } from '../../../utils/sequelize.js';
+
+class PromotionalGift extends Model {}
+
+PromotionalGift.init(
+  {
+    name: {
+      type: DataTypes.STRING,
+      allowNull: false,
+    },
+    description: {
+      type: DataTypes.TEXT,
+      allowNull: true,
+    },
+    value: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      defaultValue: 0, // Wert des Geschenks
+    },
+  },
+  {
+    sequelize,
+    modelName: 'PromotionalGift',
+    tableName: 'promotional_gift',
+    schema: 'falukant_type',
+    timestamps: false,
+    underscored: true,
+  }
+);
+
+export default PromotionalGift;

backend/models/falukant/type/relationship.js

@@ -0,0 +1,23 @@
+import { Model, DataTypes } from 'sequelize';
+import { sequelize } from '../../../utils/sequelize.js';
+
+class Relationship extends Model {}
+
+Relationship.init(
+  {
+    tr: {
+      type: DataTypes.STRING,
+      allowNull: false,
+    }
+  },
+  {
+    sequelize,
+    modelName: 'Relationship',
+    tableName: 'relationship',
+    schema: 'falukant_type',
+    timestamps: false, 
+    underscored: true,
+  }
+);
+
+export default Relationship;

backend/models/index.js

@@ -52,6 +52,18 @@ import BuyableStock from './falukant/data/buyable_stock.js';
 import MoneyFlow from './falukant/log/moneyflow.js';
 import Director from './falukant/data/director.js';
 import DirectorProposal from './falukant/data/director_proposal.js';
+import TownProductWorth from './falukant/data/town_product_worth.js';
+import DayProduction from './falukant/log/dayproduction.js';
+import DaySell from './falukant/log/daysell.js';
+import Notification from './falukant/log/notification';
+import MarriageProposal from './falukant/data/marriage_proposal.js';
+import Relationship from './falukant/type/relationship.js';
+import CharacterTrait from './falukant/type/character_trait.js';
+import FalukantCharacterTrait from './falukant/data/falukant_character_trait.js';
+import Mood from './falukant/type/mood.js';
+import PromotionalGift from './falukant/type/promotional_gift.js';
+import PromotionalGiftCharacterTrait from './falukant/predefine/promotional_gift_character_trait.js';
+import PromotionalGiftMood from './falukant/predefine/promotional_gift_mood.js';
 
 const models = {
     SettingsType,
@@ -108,6 +120,18 @@ const models = {
     MoneyFlow,
     Director,
     DirectorProposal,
+    TownProductWorth,
+    DayProduction,
+    DaySell,
+    Notification,
+    MarriageProposal,
+    Relationship,
+    CharacterTrait,
+    FalukantCharacterTrait,
+    Mood,
+    PromotionalGift,
+    PromotionalGiftCharacterTrait,
+    PromotionalGiftMood,
 };
 
 export default models;