Merge pull request #128 from ItKlubBozoLagan/dev

Prod sync

Author: VisenP

README.md

@@ -3,3 +3,6 @@
 # Kontestis
 
 The code contest and evaluation platform developed for the [2023 InfoKup Competition](https://informatika.azoo.hr/kategorija/3/Razvoj-softvera)
+
+## Evaluator
+[ItKlubBozoLagan/evaluator-v2/](https://github.com/ItKlubBozoLagan/evaluator-v2/)

apps/backend/src/database/Database.ts

@@ -1,6 +1,7 @@
 import {
     Cluster,
     ContestAnnouncement,
+    ContestChatMessage,
     ContestMember,
     ContestQuestion,
     EduUser,
@@ -13,6 +14,7 @@ import {
     OrganisationMember,
     Problem,
     SiteNotification,
+    TemporaryUser,
 } from "@kontestis/models";
 import { ClusterSubmission } from "@kontestis/models";
 import { Contest } from "@kontestis/models";
@@ -76,6 +78,8 @@ import { migration_contest_show_leaderboard } from "./migrations/0049_contest_sh
 import { migration_improve_generators } from "./migrations/0050_improve_generators";
 import { migration_add_sample_clusters } from "./migrations/0051_add_sample_clusters";
 import { migration_generator_id_index } from "./migrations/0052_generator_id_index";
+import { migration_contest_chat_messages } from "./migrations/0053_contest_chat_messages";
+import { migration_add_temporary_users } from "./migrations/0054_add_temporary_users";
 
 export const Database = new ScylloClient<{
     users: User;
@@ -88,6 +92,7 @@ export const Database = new ScylloClient<{
     testcase_submissions: TestcaseSubmission;
     contest_members: ContestMember;
     contest_questions: ContestQuestion;
+    contest_chat_messages: ContestChatMessage;
     contest_announcements: ContestAnnouncement;
     organisations: Organisation;
     organisation_members: OrganisationMember;
@@ -97,6 +102,7 @@ export const Database = new ScylloClient<{
     mail_preferences: MailPreference;
     edu_users: EduUser;
     managed_users: ManagedUser;
+    temporary_users: TemporaryUser;
     generators: Generator;
 }>({
     client: {
@@ -163,6 +169,8 @@ const migrations: Migration<any>[] = [
     migration_improve_generators,
     migration_add_sample_clusters,
     migration_generator_id_index,
+    migration_contest_chat_messages,
+    migration_add_temporary_users,
 ];
 
 export const initDatabase = async () => {

apps/backend/src/database/migrations/0053_contest_chat_messages.ts

@@ -0,0 +1,88 @@
+import { ContestChatMessageV1, ContestQuestionV2 } from "@kontestis/models";
+import { Migration } from "scyllo";
+
+import { generateSnowflake, getSnowflakeTime } from "../../lib/snowflake";
+
+type MigrationType = {
+    contest_chat_messages: ContestChatMessageV1;
+    contest_questions: ContestQuestionV2;
+};
+
+export const migration_contest_chat_messages: Migration<MigrationType> = async (database, log) => {
+    // Create chat messages table
+    await database.createTable(
+        "contest_chat_messages",
+        true,
+        {
+            id: { type: "bigint" },
+            thread_id: { type: "bigint" },
+            contest_id: { type: "bigint" },
+            author_member_id: { type: "bigint" },
+            content: { type: "text" },
+            created_at: { type: "timestamp" },
+        },
+        "id"
+    );
+
+    await database.createIndex(
+        "contest_chat_messages",
+        "contest_chat_messages_by_thread_id",
+        "thread_id"
+    );
+
+    await database.createIndex(
+        "contest_chat_messages",
+        "contest_chat_messages_by_contest_id",
+        "contest_id"
+    );
+
+    // Add new columns to contest_questions
+    await database.raw("ALTER TABLE contest_questions ADD last_message_at timestamp");
+    await database.raw("ALTER TABLE contest_questions ADD last_message_member_id bigint");
+
+    // Migrate existing questions into chat messages
+    const questions = await database.selectFrom("contest_questions", "*", {});
+
+    for (const question of questions) {
+        const questionTime = getSnowflakeTime(question.id);
+
+        // Insert the question text as the first message
+        await database.insertInto("contest_chat_messages", {
+            id: question.id,
+            thread_id: question.id,
+            contest_id: question.contest_id,
+            author_member_id: question.contest_member_id,
+            content: question.question,
+            created_at: questionTime,
+        });
+
+        let lastMessageAt = questionTime;
+        let lastMessageMemberId = question.contest_member_id;
+
+        // Insert the response as a second message if it exists
+        if (question.response && question.response_author_id) {
+            const responseTime = new Date(questionTime.getTime() + 1000);
+
+            await database.insertInto("contest_chat_messages", {
+                id: generateSnowflake(),
+                thread_id: question.id,
+                contest_id: question.contest_id,
+                author_member_id: question.response_author_id,
+                content: question.response,
+                created_at: responseTime,
+            });
+
+            lastMessageAt = responseTime;
+            lastMessageMemberId = question.response_author_id;
+        }
+
+        await database.update(
+            "contest_questions",
+            { last_message_at: lastMessageAt, last_message_member_id: lastMessageMemberId },
+            { id: question.id }
+        );
+    }
+
+    log(`Migrated ${questions.length} existing questions to chat messages`);
+    log("Done");
+};

apps/backend/src/database/migrations/0054_add_temporary_users.ts

@@ -0,0 +1,33 @@
+import { TemporaryUserV1 } from "@kontestis/models";
+import { Migration } from "scyllo";
+
+type MigrationType = {
+    temporary_users: TemporaryUserV1;
+};
+
+export const migration_add_temporary_users: Migration<MigrationType> = async (database, log) => {
+    await database.createTable(
+        "temporary_users",
+        true,
+        {
+            id: {
+                type: "bigint",
+            },
+            username: {
+                type: "text",
+            },
+            password: {
+                type: "text",
+            },
+            organisation_id: {
+                type: "bigint",
+            },
+            created_at: { type: "timestamp" },
+        },
+        "id"
+    );
+
+    await database.createIndex("temporary_users", "temporary_users_by_username", "username");
+
+    log("Done");
+};

apps/backend/src/extractors/extractUser.ts

@@ -20,6 +20,24 @@ export const extractUser = async (req: Request): Promise<FullUser> => {
 
         const { user: tokenData, authSource } = jwtData;
 
+        if (authSource === "temporary") {
+            const temporaryUser = await Database.selectOneFrom("temporary_users", "*", {
+                id: tokenData.id,
+            });
+
+            if (!temporaryUser) {
+                throw new SafeError(StatusCodes.UNAUTHORIZED);
+            }
+
+            return {
+                ...tokenData,
+                is_edu: false as const,
+                auth_source: authSource,
+                is_temporary: true,
+                temporary_data: { organisation_id: temporaryUser.organisation_id },
+            };
+        }
+
         const eduUser = await Database.selectOneFrom("edu_users", "*", {
             id: tokenData.id,
         });

apps/backend/src/lib/auth.ts

@@ -24,6 +24,7 @@ const AuthSourceType = Type.Union([
     Type.Literal("google"),
     Type.Literal("aai-edu"),
     Type.Literal("managed"),
+    Type.Literal("temporary"),
 ]);
 
 export const generateJwt = <

apps/backend/src/routes/auth/AuthHandler.ts

@@ -13,11 +13,13 @@ import { extractIdFromParameters } from "../../utils/extractorUtils";
 import { respond } from "../../utils/response";
 import { AaiEduHandler } from "./AaiEduHandler";
 import ManagedHandler from "./ManagedHandler";
+import TemporaryHandler from "./TemporaryHandler";
 
 const AuthHandler = Router();
 
 AuthHandler.use("/aai-edu", AaiEduHandler);
 AuthHandler.use("/managed", ManagedHandler);
+AuthHandler.use("/temporary", TemporaryHandler);
 
 const OAuthSchema = Type.Object({
     credential: Type.String(),