Add user comment functionality with model, controller, and routes

Author: Mipronimo

index.js

@@ -75,6 +75,7 @@ import supporterYearRouter from './src/routes/supporterYear.route.js'
 import userRouter from './src/routes/user.route.js'
 import userCriminalRecordRouter from './src/routes/userCriminalRecord.route.js'
 import userMotivationRouter from './src/routes/userMotivation.route.js'
+import userCommentRouter from './src/routes/userComment.route.js'
 import userDocumentRouter from './src/routes/userDocument.route.js'
 import userPermissionRouter from './src/routes/userPermission.route.js'
 import userYearRouter from './src/routes/userYear.route.js'
@@ -95,6 +96,7 @@ import responsibilityModel from './src/models/responsibility.model.js';
 
 import supporterYearModel from './src/models/supporterYear.model.js';
 import supporterDayModel from './src/models/supporterDay.model.js';
+import userCommentModel from './src/models/userComment.model.js';
 import userDocumentModel from './src/models/userDocument.model.js';
 import userPermissionModel from './src/models/userPermission.model.js';
 import userMotivationModel from './src/models/userMotivation.model.js';
@@ -117,6 +119,7 @@ app.use('/user', userRouter);
 app.use('/supporterYear', supporterYearRouter);
 app.use('/userCriminalRecord', userCriminalRecordRouter);
 app.use('/userMotivation', userMotivationRouter);
+app.use('/userComment', userCommentRouter);
 app.use('/userDocument', userDocumentRouter);
 app.use('/userPermission', userPermissionRouter);
 app.use('/userYear', userYearRouter);
@@ -150,6 +153,9 @@ responsibilityModel.hasOne(userModel, {foreignKey: 'uuid'})
 supporterYearModel.hasMany(supporterDayModel, {foreignKey: 'uuid'})
 supporterDayModel.hasOne(supporterYearModel, {foreignKey: 'uuid'})
 
+userModel.hasOne(userCommentModel, {foreignKey: 'uuid'})
+userCommentModel.hasOne(userModel, {foreignKey: 'uuid'})
+
 userModel.hasOne(userDocumentModel, {foreignKey: 'uuid'})
 userDocumentModel.hasOne(userModel, {foreignKey: 'uuid'})
 

src/controllers/userComment.controller.js

@@ -0,0 +1,55 @@
+import userCommentModel from '../models/userComment.model.js'
+
+export async function findAll(req, res) {
+	const isLT = req.kauth.grant.access_token.content.groups?.includes('Leitungsteam')
+	if (!isLT) {
+		res.status(403).send()
+		return;
+	}
+	try {
+		const userComment = await userCommentModel.findAll({where: req.query})
+		res.status(200).send(userComment)
+	} catch(e) {
+		res.status(400).send()
+	}
+}
+
+export async function findOne(req, res) {
+	if (!req.params || !req.params.uuid ) {
+		res.status(400).send('bad request')
+		return;
+	}
+	const isLT = req.kauth.grant.access_token.content.groups?.includes('Leitungsteam')
+	if (!isLT) {
+		res.status(403).send()
+		return;
+	}
+	const userComment = await userCommentModel.findOne({where: {uuid: req.params.uuid}})
+	if (userComment) {
+		res.status(200).send(userComment)
+	} else {
+		res.status(404).send('not found')
+	}
+}
+
+export async function createOrUpdate(req, res) {
+	const isLT = req.kauth.grant.access_token.content.groups?.includes('Leitungsteam')
+	if (!isLT) {
+		res.status(403).send()
+		return;
+	}
+	if (!req.params?.uuid) {
+		res.status(400).send('bad request')
+		return;
+	}
+	const userComment = await userCommentModel.findOne({where: {uuid: req.params.uuid}})
+	if (userComment) {
+		userCommentModel.update(req.body, {where: {uuid: req.params.uuid}});
+		res.status(200).send(userComment)
+	} else {
+		var data = req.body
+		data.uuid = req.params.uuid
+		userCommentModel.create(data)
+		res.status(200).send(userComment)
+	}
+}

src/controllers/userYear.controller.js

@@ -49,10 +49,10 @@ export async function findAll(req, res) {
 			})
 		}
 	}
-	delete req.query.userBundle
-	delete req.query.assigneeBundle
-	delete req.query.documentBundle
 	data['where'] = req.query
+	delete data.where.userBundle
+	delete data.where.assigneeBundle
+	delete data.where.documentBundle
 	try {
 		console.log(data);
 		const userYear = await userYearModel.findAll(data)
@@ -91,10 +91,12 @@ export async function createOrUpdate(req, res) {
 		return;
 	}
 	const userYear = await userYearModel.findOne({where: {uuid: req.params.uuid, year: year}})
+	req.body.registeredAt = userYear.registeredAt;
 	var data = req.body
 	if (userYear) {
 		if (userYear.status === 2) {
 			data['status'] = 3;
+			data['registeredAt'] = new Date();
 		}
 		// activate user
 		if (userYear.status !== 4 && req.body.status === 4) {

src/models/userComment.model.js

@@ -0,0 +1,16 @@
+import { DataTypes } from 'sequelize';
+import sequelize from './db.model.js';
+
+export default sequelize.define('UserComment', {
+  uuid: {
+    type: DataTypes.UUID,
+    primaryKey: true,
+    references: {
+        model: 'Users',
+        key: 'uuid'
+    }
+  },
+  comment: {
+    type: DataTypes.TEXT
+  },
+});

src/models/userYear.model.js

@@ -204,5 +204,8 @@ export default sequelize.define('UserYear', {
         model: 'Users',
         key: 'uuid'
     }
-  }
+  },
+  registeredAt: {
+    type: DataTypes.DATE
+  },
 });

src/routes/userComment.route.js

@@ -0,0 +1,11 @@
+import { Router } from 'express';
+import keycloak from '../config/keycloak.js';
+import { findAll, findOne, createOrUpdate } from '../controllers/userComment.controller.js'
+
+var router = new Router();
+
+    router.get('/', keycloak.protect(), findAll);
+    router.get('/:uuid', keycloak.protect(), findOne);
+    router.post('/:uuid', keycloak.protect(), createOrUpdate);
+
+export default router