Implemented personal settings

backend/utils/encryption.js

@@ -1,32 +1,23 @@
 import crypto from 'crypto';
-import dotenv from 'dotenv';
-
-dotenv.config(); // Laden der Umgebungsvariablen
 
 const algorithm = 'aes-256-cbc';
 const secretKey = process.env.SECRET_KEY;
 
-if (!secretKey || secretKey.length !== 32) {
-    throw new Error('SECRET_KEY length must be 32 bytes');
-}
-
-const encrypt = (text, iv) => {
-    const cipher = crypto.createCipheriv(algorithm, Buffer.from(secretKey, 'utf-8'), iv);
-    let encrypted = cipher.update(text);
-    encrypted = Buffer.concat([encrypted, cipher.final()]);
-    return encrypted.toString('hex');
-};
-
-const decrypt = (encryptedText, iv) => {
-    const encryptedBuffer = Buffer.from(encryptedText, 'hex');
-    const decipher = crypto.createDecipheriv(algorithm, Buffer.from(secretKey, 'utf-8'), iv);
-    let decrypted = decipher.update(encryptedBuffer);
-    decrypted = Buffer.concat([decrypted, decipher.final()]);
-    return decrypted.toString();
-};
-
-const generateIv = () => {
+export const generateIv = () => {
     return crypto.randomBytes(16);
 };
 
-export { encrypt, decrypt, generateIv };
+export const encrypt = (text, iv) => {
+    const cipher = crypto.createCipheriv(algorithm, Buffer.from(secretKey, 'utf-8'), iv);
+    let encrypted = cipher.update(text, 'utf8', 'hex');
+    encrypted += cipher.final('hex');
+    return encrypted;
+};
+
+export const decrypt = (text, iv) => {
+    console.log(text, secretKey, iv);
+    const decipher = crypto.createDecipheriv(algorithm, Buffer.from(secretKey, 'utf-8'), iv);
+    let decrypted = decipher.update(text, 'hex', 'utf8');
+    decrypted += decipher.final('utf8');
+    return decrypted;
+};

backend/utils/initializeSettings.js

@@ -1,4 +1,4 @@
-import SettingsType from "../models/type/settings_type.js";
+import SettingsType from "../models/type/settings.js";
 
 const initializeSettings = async () => {
     await SettingsType.findOrCreate({

backend/utils/initializeTypes.js

@@ -1,5 +1,6 @@
 import UserParamType from '../models/type/user_param.js';
-import SettingsType from '../models/type/settings_type.js'; // Importiere SettingsType
+import SettingsType from '../models/type/settings.js';
+import UserParamValue from '../models/type/user_param_value.js';
 
 const initializeTypes = async () => {
     const settingsTypes = await SettingsType.findAll();
@@ -9,78 +10,141 @@ const initializeTypes = async () => {
     }, {});
 
     const getSettingsTypeId = (name) => settingsTypeMap[name];
+    console.log(settingsTypeMap, getSettingsTypeId('personal'));
+
+    const getUserParamTypeId = async(name) => {
+        const userParamType = await UserParamType.findOne({
+            where: {
+                description: name
+            }
+        });
+        return userParamType.id;
+    };
 
     await UserParamType.findOrCreate({
         where: { description: 'language' },
-        defaults: { description: 'language', datatype: 'string', settingsTypeId: getSettingsTypeId('personal') }
+        defaults: { description: 'language', datatype: 'singleselect', settingsId: getSettingsTypeId('personal') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'birthdate' },
-        defaults: { description: 'birthdate', datatype: 'date', settingsTypeId: getSettingsTypeId('personal') }
+        defaults: { description: 'birthdate', datatype: 'date', settingsId: getSettingsTypeId('personal') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'zip' },
-        defaults: { description: 'zip', datatype: 'string', settingsTypeId: getSettingsTypeId('personal') }
+        defaults: { description: 'zip', datatype: 'string', settingsId: getSettingsTypeId('personal') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'town' },
-        defaults: { description: 'town', datatype: 'string', settingsTypeId: getSettingsTypeId('personal') }
+        defaults: { description: 'town', datatype: 'string', settingsId: getSettingsTypeId('personal') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'bodyheight' },
-        defaults: { description: 'bodyheight', datatype: 'float', settingsTypeId: getSettingsTypeId('view') }
+        defaults: { description: 'bodyheight', datatype: 'float', settingsId: getSettingsTypeId('view') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'weight' },
-        defaults: { description: 'weight', datatype: 'float', settingsTypeId: getSettingsTypeId('view') }
+        defaults: { description: 'weight', datatype: 'float', settingsId: getSettingsTypeId('view') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'eyecolor' },
-        defaults: { description: 'eyecolor', datatype: 'string', settingsTypeId: getSettingsTypeId('view') }
+        defaults: { description: 'eyecolor', datatype: 'string', settingsId: getSettingsTypeId('view') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'haircolor' },
-        defaults: { description: 'haircolor', datatype: 'string', settingsTypeId: getSettingsTypeId('view') }
+        defaults: { description: 'haircolor', datatype: 'string', settingsId: getSettingsTypeId('view') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'hairlength' },
-        defaults: { description: 'hairlength', datatype: 'int', settingsTypeId: getSettingsTypeId('view') }
+        defaults: { description: 'hairlength', datatype: 'int', settingsId: getSettingsTypeId('view') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'skincolor' },
-        defaults: { description: 'skincolor', datatype: 'int', settingsTypeId: getSettingsTypeId('view') }
+        defaults: { description: 'skincolor', datatype: 'int', settingsId: getSettingsTypeId('view') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'freckles' },
-        defaults: { description: 'freckles', datatype: 'int', settingsTypeId: getSettingsTypeId('view') }
+        defaults: { description: 'freckles', datatype: 'int', settingsId: getSettingsTypeId('view') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'piercings' },
-        defaults: { description: 'piercings', datatype: 'bool', settingsTypeId: getSettingsTypeId('view') }
+        defaults: { description: 'piercings', datatype: 'bool', settingsId: getSettingsTypeId('view') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'tattoos' },
-        defaults: { description: 'tattoos', datatype: 'bool', settingsTypeId: getSettingsTypeId('view') }
+        defaults: { description: 'tattoos', datatype: 'bool', settingsId: getSettingsTypeId('view') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'sexualpreference' },
-        defaults: { description: 'sexualpreference', minAge: 14, datatype: 'int', settingsTypeId: getSettingsTypeId('sexuality') }
+        defaults: { description: 'sexualpreference', minAge: 14, datatype: 'int', settingsId: getSettingsTypeId('sexuality') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'gender' },
-        defaults: { description: 'gender', datatype: 'string', settingsTypeId: getSettingsTypeId('personal') }
+        defaults: { description: 'gender', datatype: 'singleselect', settingsId: getSettingsTypeId('personal') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'pubichair' },
-        defaults: { description: 'pubichair', minAge: 14, datatype: 'int', settingsTypeId: getSettingsTypeId('sexuality') }
+        defaults: { description: 'pubichair', minAge: 14, datatype: 'int', settingsId: getSettingsTypeId('sexuality') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'penislength' },
-        defaults: { description: 'penislength', minAge: 14, gender: 'm', datatype: 'int', settingsTypeId: getSettingsTypeId('sexuality') }
+        defaults: { description: 'penislength', minAge: 14, gender: 'm', datatype: 'int', settingsId: getSettingsTypeId('sexuality') }
     });
     await UserParamType.findOrCreate({
         where: { description: 'brasize' },
-        defaults: { description: 'brasize', minAge: 14, gender: 'f', datatype: 'string', settingsTypeId: getSettingsTypeId('sexuality') }
+        defaults: { description: 'brasize', minAge: 14, gender: 'f', datatype: 'string', settingsId: getSettingsTypeId('sexuality') }
+    });
+
+    const genderId = await getUserParamTypeId('gender');
+    await UserParamValue.findOrCreate({
+        where: { 
+            userParamTypeId: genderId,
+            value: 'male'
+        },
+        defaults: { userParamTypeId: genderId, value: 'male' }
+    });
+    await UserParamValue.findOrCreate({
+        where: { 
+            userParamTypeId: genderId,
+            value: 'female'
+        },
+        defaults: { userParamTypeId: genderId, value: 'female' }
+    });
+    await UserParamValue.findOrCreate({
+        where: { 
+            userParamTypeId: genderId,
+            value: 'transfemale'
+        },
+        defaults: { userParamTypeId: genderId, value: 'transfemale' }
+    });
+    await UserParamValue.findOrCreate({
+        where: { 
+            userParamTypeId: genderId,
+            value: 'transmale'
+        },
+        defaults: { userParamTypeId: genderId, value: 'transmale' }
+    });
+    await UserParamValue.findOrCreate({
+        where: { 
+            userParamTypeId: genderId,
+            value: 'nonbinary'
+        },
+        defaults: { userParamTypeId: genderId, value: 'nonbinary' }
+    });
+
+    const languageId = await getUserParamTypeId('language');
+    await UserParamValue.findOrCreate({
+        where: {
+            userParamTypeId: languageId,
+            value: 'de'
+        },
+        defaults: { userParamTypeId: languageId, value: 'de' }
+    });
+    await UserParamValue.findOrCreate({
+        where: {
+            userParamTypeId: languageId,
+            value: 'en'
+        },
+        defaults: { userParamTypeId: languageId, value: 'en' }
     });
 };
 

backend/utils/sequelize.js

@@ -16,7 +16,7 @@ const createSchemas = async () => {
     await sequelize.query('CREATE SCHEMA IF NOT EXISTS logs');
     await sequelize.query('CREATE SCHEMA IF NOT EXISTS type');
 };
-
+ 
 const initializeDatabase = async () => {
     await createSchemas();
     const models = await import('../models/index.js');

backend/utils/syncDatabase.js

@@ -2,10 +2,19 @@ import { initializeDatabase } from './sequelize.js';
 import initializeTypes from './initializeTypes.js';
 import initializeSettings from './initializeSettings.js';
 import initializeUserRights from './initializeUserRights.js';
+import setupAssociations from '../models/associations.js';
+import models from '../models/index.js';
 
 const syncDatabase = async () => {
     try {
         await initializeDatabase();
+        for (const model of Object.values(models)) {
+            await model.sync({ alter: true });
+        }
+        setupAssociations();
+        for (const model of Object.values(models)) {
+            await model.sync({ alter: true });
+        }
         await initializeSettings();
         await initializeTypes();
         await initializeUserRights();