rename endpoints

UniversityOfHelsinkiCS · Jan 23, 2025 · 0749331 · 0749331
1 parent 55ddf41
commit 0749331
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/server/controllers/reportsController.ts b/server/controllers/reportsController.ts
@@ -7,9 +7,6 @@ import Report from '../models/reports.js'
 // Types
 import type { Request, Response } from 'express'
 
-
-
-
 interface ValidateOperationResponse {
     success: boolean,
     error: string,
@@ -213,15 +210,15 @@ const updateComments = async (req: Request, res: Response) => {
 }
 
 
-// Actions ---------------------------------------------------------------
-const getActions = async (req: Request, res: Response) => {
+// Studyprogramme Measures ---------------------------------------------------------------
+const getStudyprogrammeMeasures = async (req: Request, res: Response) => {
     try {
         const result = await validateOperation(req)
         if (!result.success) return res.status(result.status).json({ error: result.error })
 
         const { report } = result
 
-        const data = report.actions
+        const data = report.studyprogrammeMeasures
 
         return res.status(200).json(data)
 
@@ -231,16 +228,16 @@ const getActions = async (req: Request, res: Response) => {
     }
 }
 
-const updateActions = async (req: Request, res: Response) => {
+const updateStudyprogrammeMeasures = async (req: Request, res: Response) => {
     try {
         const result = await validateOperation(req)
         if (!result.success) return res.status(result.status).json({ error: result.error })
 
         const { studyprogrammeId, year } = result
-        const actions = req.body
+        const studyprogrammeMeasures = req.body
 
         const data = await Report.update({
-            actions,
+            studyprogrammeMeasures,
         }, {
             where: {
                 studyprogrammeId,
@@ -257,15 +254,15 @@ const updateActions = async (req: Request, res: Response) => {
 
 
 // Faculty Actions ---------------------------------------------------------------
-const getFacultyActions = async (req: Request, res: Response) => {
+const getFacultyMeasures = async (req: Request, res: Response) => {
     try {
 
         const result = await validateOperation(req)
         if (!result.success) return res.status(result.status).json({ error: result.error })
 
         const { report } = result
 
-        const data = report.facultyActions
+        const data = report.facultyMeasures
 
         return res.status(200).json(data)
 
@@ -276,16 +273,16 @@ const getFacultyActions = async (req: Request, res: Response) => {
 }
 
 
-const updateFacultyActions = async (req: Request, res: Response) => {
+const updateFacultyMeasures = async (req: Request, res: Response) => {
     try {
         const result = await validateOperation(req)
         if (!result.success) return res.status(result.status).json({ error: result.error })
 
         const { studyprogrammeId, year } = result
-        const facultyActions = req.body
+        const facultyMeasures = req.body
 
         const data = await Report.update({
-            facultyActions,
+            facultyMeasures,
         }, {
             where: {
                 studyprogrammeId,
@@ -307,10 +304,13 @@ export default {
     getReports,
     getReport,
     deleteReport,
+
     getComments,
     updateComments,
-    getActions,
-    updateActions,
-    getFacultyActions,
-    updateFacultyActions
+
+    getStudyprogrammeMeasures,
+    updateStudyprogrammeMeasures,
+
+    getFacultyMeasures,
+    updateFacultyMeasures
 }
diff --git a/server/models/reports.ts b/server/models/reports.ts
@@ -15,8 +15,8 @@ class Report extends Model<InferAttributes<Report>, InferCreationAttributes<Repo
     declare studyprogrammeId: ForeignKey<number>;
     declare year: number;
     declare comments: any
-    declare actions: any
-    declare facultyActions: any
+    declare studyprogrammeMeasures: any
+    declare facultyMeasures: any
     declare createdAt: CreationOptional<Date>;
     declare updatedAt: CreationOptional<Date>;
 }
@@ -41,11 +41,11 @@ Report.init(
             type: JSONB,
             defaultValue: null
         },
-        actions: {
+        studyprogrammeMeasures: {
             type: JSONB,
             defaultValue: null
         },
-        facultyActions: {
+        facultyMeasures: {
             type: JSONB,
             defaultValue: null
         },

diff --git a/server/util/routes.js b/server/util/routes.js
@@ -77,10 +77,10 @@ router.get('/reports/:studyprogrammeId/:year', reports.getReport)
 router.delete('/reports/:studyprogrammeId/:year', reports.deleteReport)
 router.get('/reports/:studyprogrammeId/:year/comments/', checkAdmin, reports.getComments)
 router.put('/reports/:studyprogrammeId/:year/comments/', checkAdmin, reports.updateComments)
-router.get('/reports/:studyprogrammeId/:year/actions/', checkAdmin, reports.getActions)
-router.put('/reports/:studyprogrammeId/:year/actions/', checkAdmin, reports.updateActions)
-router.get('/reports/:studyprogrammeId/:year/facultyActions/', checkAdmin, reports.getFacultyActions)
-router.put('/reports/:studyprogrammeId/:year/facultyActions/', checkAdmin, reports.updateFacultyActions)
+router.get('/reports/:studyprogrammeId/:year/studyprogrammeMeasures/', checkAdmin, reports.getStudyprogrammeMeasures)
+router.put('/reports/:studyprogrammeId/:year/studyprogrammeMeasures/', checkAdmin, reports.updateStudyprogrammeMeasures)
+router.get('/reports/:studyprogrammeId/:year/facultyMeasures/', checkAdmin, reports.getFacultyMeasures)
+router.put('/reports/:studyprogrammeId/:year/facultyMeasures/', checkAdmin, reports.updateFacultyMeasures)
 
 router.get('/cypress/seed', notInProduction, cypress.seed)
 router.get('/cypress/createAnswers/:form', notInProduction, cypress.createAnswers)