Tags => Code integration

ExpressAPI/.idea/material_theme_project_new.xml

@@ -3,7 +3,9 @@
   <component name="MaterialThemeProjectNewConfig">
     <option name="metadata">
       <MTProjectMetadataState>
-        <option name="userId" value="104e8585:19002424fea:-7fcc" />
+        <option name="migrated" value="true" />
+        <option name="pristineConfig" value="false" />
+        <option name="userId" value="104e8585:19002424fea:-7ffe" />
       </MTProjectMetadataState>
     </option>
   </component>

ExpressAPI/assets/OpenAPI/OpenAPI.yaml

 openapi: 3.1.0
 info:
     title: Dojo API
-    version: 4.1.0
+    version: 4.2.0
     description: |
         **Backend API of the Dojo project.**
         

ExpressAPI/prisma/migrations/20240222174056_add_correction_to_assignment/migration.sql → ExpressAPI/prisma/migrations/20240212153007_add_tags/migration.sql

+-- CreateTable
+CREATE TABLE `Tag` (
+    `name` CHAR(36) NOT NULL,
+    `type` ENUM('LANGUAGE', 'FRAMEWORK', 'THEME', 'USERDEFINED') NOT NULL,
+
+    PRIMARY KEY (`name`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
 -- CreateTable
 CREATE TABLE `_AssignmentToTag` (
     `A` VARCHAR(191) NOT NULL,
@@ -27,3 +35,12 @@ ALTER TABLE `_ExerciseToTag` ADD CONSTRAINT `_ExerciseToTag_A_fkey` FOREIGN KEY
 
 -- AddForeignKey
 ALTER TABLE `_ExerciseToTag` ADD CONSTRAINT `_ExerciseToTag_B_fkey` FOREIGN KEY (`B`) REFERENCES `Tag`(`name`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- CreateTable
+CREATE TABLE `SubmissionTag` (
+    `name` CHAR(36) NOT NULL,
+    `type` ENUM('LANGUAGE', 'FRAMEWORK', 'THEME', 'USERDEFINED') NOT NULL,
+    `state` VARCHAR(191) NOT NULL,
+
+    PRIMARY KEY (`name`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

ExpressAPI/prisma/migrations/20240212153538_test_tag/migration.sql

--- This is an empty migration.
\ No newline at end of file

ExpressAPI/prisma/migrations/20240212155805_description_of_the_migration/migration.sql

--- This is an empty migration.
\ No newline at end of file

ExpressAPI/prisma/migrations/20240212155844_description_of_the_migration/migration.sql

--- This is an empty migration.
\ No newline at end of file

ExpressAPI/prisma/migrations/20240309094026_add_correction_to_assignment/migration.sql

--- CreateTable
-CREATE TABLE `SubmissionTag` (
-    `name` CHAR(36) NOT NULL,
-    `type` ENUM('LANGUAGE', 'FRAMEWORK', 'THEME', 'USERDEFINED') NOT NULL,
-
-    PRIMARY KEY (`name`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

ExpressAPI/prisma/migrations/20240309201554_tags/migration.sql

--- This is an empty migration.
\ No newline at end of file

ExpressAPI/prisma/migrations/20240309204629_tag_type/migration.sql

--- This is an empty migration.
\ No newline at end of file

ExpressAPI/prisma/migrations/20240311140413_tag_type/migration.sql

--- This is an empty migration.
\ No newline at end of file

ExpressAPI/prisma/migrations/20240320215213_add_correction_to_assignment/migration.sql

-/*
-  Warnings:
-
-  - Added the required column `state` to the `SubmissionTag` table without a default value. This is not possible if the table is not empty.
-
-*/
--- AlterTable
-ALTER TABLE `SubmissionTag` ADD COLUMN `state` ENUM('PENDINGAPPROVAL', 'DECLINED', 'APPROVED') NOT NULL;

ExpressAPI/prisma/migrations/20240320220606_add_correction_to_assignment/migration.sql

-/*
-  Warnings:
-
-  - You are about to alter the column `state` on the `SubmissionTag` table. The data in that column could be lost. The data in that column will be cast from `Enum(EnumId(3))` to `VarChar(191)`.
-
-*/
--- AlterTable
-ALTER TABLE `SubmissionTag` MODIFY `state` VARCHAR(191) NOT NULL;

ExpressAPI/prisma/migrations/20240321212753_add_correction_to_assignment/migration.sql

-/*
-  Warnings:
-
-  - You are about to alter the column `state` on the `SubmissionTag` table. The data in that column could be lost. The data in that column will be cast from `VarChar(191)` to `Enum(EnumId(3))`.
-
-*/
--- AlterTable
-ALTER TABLE `SubmissionTag` MODIFY `state` ENUM('PENDINGAPPROVAL', 'DECLINED', 'APPROVED') NOT NULL;

ExpressAPI/prisma/migrations/20240321213742_add_correction_to_assignment/migration.sql

--- This is an empty migration.
\ No newline at end of file

ExpressAPI/prisma/migrations/20240321214043_add_correction_to_assignment/migration.sql

-/*
-  Warnings:
-
-  - You are about to alter the column `state` on the `SubmissionTag` table. The data in that column could be lost. The data in that column will be cast from `Enum(EnumId(3))` to `VarChar(191)`.
-
-*/
--- AlterTable
-ALTER TABLE `SubmissionTag` MODIFY `state` VARCHAR(191) NOT NULL;

ExpressAPI/prisma/migrations/20240212153007_test_tag/migration.sql → ExpressAPI/prisma/migrations/20240619160717_rename_tag_proposal_table/migration.sql

+/*
+  Warnings:
+
+  - You are about to drop the `SubmissionTag` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropTable
+DROP TABLE `SubmissionTag`;
+
 -- CreateTable
-CREATE TABLE `Tag` (
+CREATE TABLE `TagProposal` (
     `name` CHAR(36) NOT NULL,
     `type` ENUM('LANGUAGE', 'FRAMEWORK', 'THEME', 'USERDEFINED') NOT NULL,
+    `state` VARCHAR(191) NOT NULL,
 
     PRIMARY KEY (`name`)
 ) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

ExpressAPI/prisma/migrations/20240619232301_set_tag_proposal_state_default/migration.sql

+-- AlterTable
+ALTER TABLE `TagProposal` MODIFY `state` VARCHAR(191) NOT NULL DEFAULT 'PendingApproval';

ExpressAPI/prisma/migrations/20240619232804_add_tag_proposal_details/migration.sql

+-- AlterTable
+ALTER TABLE `TagProposal` ADD COLUMN `details` VARCHAR(191) NULL;

ExpressAPI/prisma/schema.prisma

@@ -15,9 +15,9 @@ enum UserRole {
 
 enum TagType {
     LANGUAGE
-	FRAMEWORK
-	THEME
-	USERDEFINED
+    FRAMEWORK
+    THEME
+    USERDEFINED
 }
 
 model User {
@@ -44,7 +44,7 @@ model Assignment {
 
     exercises Exercise[]
     staff     User[]
-    tags     Tag[]
+    tags      Tag[]
 }
 
 model Exercise {
@@ -83,15 +83,16 @@ model Result {
 }
 
 model Tag {
-    name        String   @id @db.Char(36)
-    type        TagType     
+    name String  @id @db.Char(36)
+    type TagType
 
-    assignment  Assignment[]
-    exercise    Exercise[]
+    assignments Assignment[]
+    exercises   Exercise[]
 }
 
-model SubmissionTag {
-    name        String   @id @db.Char(36)
-    type        TagType 
-    state       String
-}
+model TagProposal {
+    name    String  @id @db.Char(36)
+    type    TagType
+    state   String  @default("PendingApproval")
+    details String?
\ No newline at end of file
+}

ExpressAPI/src/managers/TagProposalManager.ts

+import { TagProposal } from '@prisma/client';
+import db              from '../helpers/DatabaseHelper';
+
+
+class TagProposalManager {
+    async get(name: string | undefined = undefined): Promise<TagProposal | undefined> {
+        return await db.tagProposal.findUnique({
+                                                   where: {
+                                                       name: name
+                                                   }
+                                               }) as unknown as TagProposal ?? undefined;
+    }
+}
+
+
+export default new TagProposalManager();
+

[michael.minelli]

@vincent.steinman Drole de nom pour le dossier de la migration... @orestis.malaspin

[michael.minelli]

@vincent.steinman

1. La encore en regardant ce qui se fait ailleurs dans le fichier. Les tableaux qui jouent le rôle de jointure sont nommé au pluriel.
2. Je ne l'ai pas encore retiré car je peux me tromper, mais je ne vois pas pourquoi vous avez mis des tags sur les exercices ? Qui les définirai et pourquoi pas seulement prendre ceux de l'assignment correspondant ? @orestis.malaspin

[michael.minelli]

@vincent.steinman N'oubliez pas que vous pouvez mettre des valeurs par défaut @orestis.malaspin