@aurora-interactive/sensei-productivity 1.0.0 → 1.1.2

package/rest-api/cypress.config.ts

@@ -14,11 +14,32 @@ export default defineConfig({
         },
 
         async reseedCategoriesTable() {
-          await prisma.$executeRaw`DELETE FROM Category WHERE category_id NOT IN (1, 2, 3, 4);`;
+          await prisma.category.deleteMany({
+            where: {
+              category_id: {
+                notIn: [1, 2, 3, 4]
+              }
+            }
+          });
+
           await prisma.$executeRaw`REPLACE INTO Category (category_id, category_name, category_weight, category_description) VALUES (1, 'Academic', 3, 'Studying for an exam, completing coursework, etc.')`;
 
           return true;
         },
+
+        async reseedUserActivityTable() {
+          await prisma.user_Activity.deleteMany({
+            where: {
+              activity_id: {
+                not: 1
+              }
+            }
+          });
+
+          await prisma.$executeRaw`REPLACE INTO User_Activity (activity_id, user_id, category_name, activity_deadline, details) VALUES (1, 2, 'Professional', '2026-03-01 23:59:00', '')`;
+
+          return true;
+        }
       })
     },
     baseUrl: "http://localhost:3000/api/v1/"

package/rest-api/index.js

@@ -7,6 +7,7 @@ import { readFileSync } from 'node:fs';
 import * as UserFuctions from "./routes/UserFunctions.js";
 import * as SchoolFunctions from "./routes/SchoolFunctions.js";
 import * as CategoryFunctions from "./routes/CategoryFunctions.js";
+import * as UserActivityFunction from "./routes/UserActivityFunctions.js";
 
 const spec = yamlLoad(readFileSync("./api-spec.yaml"));
 
@@ -29,7 +30,13 @@ const handler = {
   listCategories: CategoryFunctions.listCategoriesHandler,
   createCategory: CategoryFunctions.createCategoryHandler,
   updateCategory: CategoryFunctions.updateCategoryHandler,
-  deleteCategory: CategoryFunctions.deleteCategoryHandler
+  deleteCategory: CategoryFunctions.deleteCategoryHandler,
+  getUserActivities: UserActivityFunction.getUserActivitiesHandler,
+  listActivities: UserActivityFunction.listActivitiesHandler,
+  createActivity: UserActivityFunction.createActivityHandler,
+  getActivityById: UserActivityFunction.getActivityByIdHandler,
+  updateActivity: UserActivityFunction.updateActivityHandler,
+  deleteActivity: UserActivityFunction.deleteActivityHandler
 };
 
 fastify.register(oasFastify, { spec, handler });
@@ -37,7 +44,7 @@ fastify.register(oasFastify, { spec, handler });
 fastify.prisma = prisma;
 
 try {
-  await fastify.listen({ port: 3000 })
+  await fastify.listen({ host: "0.0.0.0", port: 3000 })
 } catch (err) {
   console.log(err);
   process.exit(1)

package/rest-api/routes/UserActivityFunctions.js

@@ -0,0 +1,304 @@
+async function getUserAuthInfo(prisma, accessToken) {
+    return await prisma.users.findFirst({
+        where: {
+            access_token: accessToken
+        },
+        select: {
+            user_id: true
+        }
+    });
+}
+
+async function areUsersFriends(prisma, userId, targetPotentialFriendId) {
+    const friendInfo = await prisma.User_Friends.findFirst({
+        where: {
+            OR: [
+                {
+                    user_id: userId,
+                    friend_id: targetPotentialFriendId,
+                },
+                {
+                    user_id: targetPotentialFriendId,
+                    friend_id: userId,
+                },
+            ],
+        },
+    });
+
+    if (friendInfo === null) {
+        return false;
+    }
+
+    return true;
+}
+
+export async function getUserActivitiesHandler(request, reply, fastify) {
+    const accessToken = (request.headers.authorization ?? "").substring(7)
+    const targetUserId = request.params.id;
+    const userInfo = await getUserAuthInfo(fastify.prisma, accessToken);
+
+    if (userInfo === null) {
+        reply.status(401);
+        return;
+    }
+
+    const targetUserInfo = await fastify.prisma.users.count({
+        where: {
+            user_id: targetUserId
+        }
+    });
+
+    // check for user existence
+    if (targetUserInfo < 1) {
+        reply.status(404);
+        return;
+    }
+
+    const areFriends = await areUsersFriends(fastify.prisma, userInfo.user_id, targetUserId);
+
+    const targetUserActivities = await fastify.prisma.User_Activity.findMany({
+        where: {
+            user_id: targetUserId,
+            is_private: areFriends ? undefined : false
+        },
+        select: {
+            activity_id: true,
+            category_name: true,
+            activity_status: true,
+            activity_deadline: true,
+        }
+    });
+
+    return targetUserActivities.map(activity => ({
+        activityId: activity.activity_id,
+        userId: targetUserId,
+        categoryName: activity.category_name,
+        activityStatus: activity.activity_status,
+        activityDeadline: activity.activity_deadline
+    }));
+}
+
+export async function listActivitiesHandler(request, reply, fastify) {
+    const accessToken = (request.headers.authorization ?? "").substring(7)
+    const userInfo = await getUserAuthInfo(fastify.prisma, accessToken);
+
+    if (userInfo === null) {
+        reply.status(401);
+        return;
+    }
+
+    const userActivities = await fastify.prisma.User_Activity.findMany({
+        where: {
+            user_id: userInfo.user_id,
+        },
+        select: {
+            activity_id: true,
+            category_name: true,
+            activity_status: true,
+            activity_deadline: true,
+        }
+    });
+
+    return userActivities.map(activity => ({
+        activityId: activity.activity_id,
+        userId: userInfo.user_id,
+        categoryName: activity.category_name,
+        activityStatus: activity.activity_status,
+        activityDeadline: activity.activity_deadline
+    }));
+}
+
+export async function createActivityHandler(request, reply, fastify) {
+    const accessToken = (request.headers.authorization ?? "").substring(7)
+    const userInfo = await getUserAuthInfo(fastify.prisma, accessToken);
+
+    if (userInfo === null) {
+        reply.status(401);
+        return;
+    }
+
+    const categoryInfo = await fastify.prisma.Category.findFirst({
+        where: {
+            category_name: request.body.categoryName
+        },
+        select: {
+            category_id: true
+        }
+    });
+
+    if (categoryInfo === null) {
+        reply.status(400);
+        return;
+    }
+
+    const activity = await fastify.prisma.User_Activity.create({
+        data: {
+            user_id: userInfo.user_id,
+            category_name: request.body.categoryName,
+            activity_deadline: request.body.activityDeadline,
+            details: request.body.details ?? null,
+            is_private: request.body.isPrivate ?? false
+        }
+    });
+
+    return {
+        activityId: activity.activity_id,
+        userId: Number(userInfo.user_id),
+        categoryName: request.body.categoryName,
+        activityStatus: activity.activity_status,
+        activityDeadline: request.body.activityDeadline,
+        details: request.body.details ?? null,
+        isPrivate: request.body.isPrivate ?? false
+    };
+}
+
+export async function getActivityByIdHandler(request, reply, fastify) {
+    const accessToken = (request.headers.authorization ?? "").substring(7);
+    const userInfo = await getUserAuthInfo(fastify.prisma, accessToken);
+
+    if (userInfo === null) {
+        reply.status(401);
+        return;
+    }
+
+    const activity = await fastify.prisma.User_Activity.findFirst({
+        where: {
+            activity_id: request.params.id
+        },
+        select: {
+            user_id: true,
+            category_name: true,
+            activity_status: true,
+            activity_deadline: true,
+            activity_start_timestamp: true,
+            details: true,
+            is_private: true
+        }
+    });
+
+    if (activity === null) {
+        reply.status(404);
+        return;
+    }
+
+    if (activity.user_id !== userInfo.user_id) {
+        reply.status(403);
+        return;
+    }
+
+    return {
+        activityId: request.params.id,
+        userId: userInfo.user_id,
+        categoryName: activity.category_name,
+        activityStatus: activity.activity_status,
+        activityDeadline: activity.activity_deadline,
+        activityStartTimestamp: activity.activity_start_timestamp,
+        details: activity.details,
+        isPrivate: activity.is_private
+    };
+}
+
+export async function updateActivityHandler(request, reply, fastify) {
+    if (Object.keys(request.body).length === 0) {
+        reply.status(400);
+        return;
+    }
+
+    const accessToken = (request.headers.authorization ?? "").substring(7);
+    const userInfo = await getUserAuthInfo(fastify.prisma, accessToken);
+
+    if (userInfo === null) {
+        reply.status(401);
+        return;
+    }
+
+    const currentActivity = await fastify.prisma.User_Activity.findFirst({
+        where: {
+            activity_id: request.params.id
+        },
+        select: {
+            user_id: true,
+            category_name: true,
+            activity_status: true,
+            activity_deadline: true,
+            activity_start_timestamp: true,
+            details: true,
+            is_private: true
+        }
+    });
+
+    if (currentActivity === null) {
+        reply.status(404);
+        return;
+    }
+
+    if (currentActivity.user_id !== userInfo.user_id) {
+        reply.status(403);
+        return;
+    }
+
+    const targetActivityStatus = request.body.activityStatus ?? currentActivity.activity_status;
+    const targetActivityDeadline = request.body.activityDeadline ?? currentActivity.activity_deadline;
+    const targetDetails = request.body.details ?? currentActivity.details;
+    const targetIsPrivate = request.body.isPrivate ?? currentActivity.is_private;
+
+    const updatedActivity = await fastify.prisma.User_Activity.update({
+        where: {
+            activity_id: request.params.id
+        },
+        data: {
+            activity_status: targetActivityStatus,
+            activity_deadline: targetActivityDeadline,
+            details: targetDetails,
+            is_private: targetIsPrivate
+        }
+    });
+
+    return {
+        activityId: request.params.id,
+        userId: userInfo.user_id,
+        categoryName: updatedActivity.category_name,
+        activityStartTimestamp: updatedActivity.activity_start_timestamp,
+        activityStatus: targetActivityStatus,
+        activityDeadline: targetActivityDeadline,
+        details: targetDetails,
+        isPrivate: targetIsPrivate
+    };
+}
+
+export async function deleteActivityHandler(request, reply, fastify) {
+    const accessToken = (request.headers.authorization ?? "").substring(7);
+    const userInfo = await getUserAuthInfo(fastify.prisma, accessToken);
+
+    if (userInfo === null) {
+        reply.status(401);
+        return;
+    }
+
+    const currentActivity = await fastify.prisma.User_Activity.findFirst({
+        where: {
+            activity_id: request.params.id
+        },
+        select: {
+            user_id: true,
+        }
+    });
+
+    if (currentActivity === null) {
+        reply.status(404);
+        return;
+    }
+
+    if (currentActivity.user_id !== userInfo.user_id) {
+        reply.status(403);
+        return;
+    }
+
+    await fastify.prisma.User_Activity.delete({
+        where: {
+            activity_id: request.params.id
+        }
+    });
+
+    return;
+}

package/src/funcs/categories-create.ts

@@ -24,6 +24,7 @@ import { SenseiProductivityError } from "../models/errors/sensei-productivity-er
 import * as operations from "../models/operations/index.js";
 import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
+import * as types$ from "../types/primitives.js";
 
 /**
  * Create a new category (school admins only)
@@ -34,7 +35,7 @@ export function categoriesCreate(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.CreateCategoryResponse,
+    operations.CreateCategoryResponse | undefined,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -59,7 +60,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.CreateCategoryResponse,
+      operations.CreateCategoryResponse | undefined,
       | SenseiProductivityError
       | ResponseValidationError
       | ConnectionError
@@ -105,8 +106,18 @@ async function $do(
     securitySource: client._options.bearerAuth,
     retryConfig: options?.retries
       || client._options.retryConfig
+      || {
+        strategy: "backoff",
+        backoff: {
+          initialInterval: 1000,
+          maxInterval: 60000,
+          exponent: 1.3,
+          maxElapsedTime: 3600000,
+        },
+        retryConnectionErrors: true,
+      }
       || { strategy: "none" },
-    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
+    retryCodes: options?.retryCodes || ["429", "5XX"],
   };
 
   const requestRes = client._createRequest(context, {
@@ -126,7 +137,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["400", "401", "403", "4XX", "5XX"],
+    errorCodes: ["429", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -136,7 +147,7 @@ async function $do(
   const response = doResult.value;
 
   const [result] = await M.match<
-    operations.CreateCategoryResponse,
+    operations.CreateCategoryResponse | undefined,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -146,8 +157,15 @@ async function $do(
     | UnexpectedClientError
     | SDKValidationError
   >(
-    M.json(201, operations.CreateCategoryResponse$inboundSchema),
-    M.fail([400, 401, 403, "4XX"]),
+    M.json(
+      201,
+      types$.optional(operations.CreateCategoryResponse$inboundSchema),
+    ),
+    M.nil(
+      [400, 401, 403],
+      types$.optional(operations.CreateCategoryResponse$inboundSchema),
+    ),
+    M.fail(429),
     M.fail("5XX"),
   )(response, req);
   if (!result.ok) {

package/src/funcs/categories-delete.ts

@@ -111,8 +111,18 @@ async function $do(
     securitySource: client._options.bearerAuth,
     retryConfig: options?.retries
       || client._options.retryConfig
+      || {
+        strategy: "backoff",
+        backoff: {
+          initialInterval: 1000,
+          maxInterval: 60000,
+          exponent: 1.3,
+          maxElapsedTime: 3600000,
+        },
+        retryConnectionErrors: true,
+      }
       || { strategy: "none" },
-    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
+    retryCodes: options?.retryCodes || ["429", "5XX"],
   };
 
   const requestRes = client._createRequest(context, {
@@ -132,7 +142,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["401", "403", "404", "4XX", "5XX"],
+    errorCodes: ["429", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -153,7 +163,8 @@ async function $do(
     | SDKValidationError
   >(
     M.nil(200, z.void()),
-    M.fail([401, 403, 404, "4XX"]),
+    M.nil([401, 403, 404], z.void()),
+    M.fail(429),
     M.fail("5XX"),
   )(response, req);
   if (!result.ok) {

package/src/funcs/categories-get-all.ts

@@ -22,6 +22,7 @@ import { SenseiProductivityError } from "../models/errors/sensei-productivity-er
 import * as operations from "../models/operations/index.js";
 import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
+import * as types$ from "../types/primitives.js";
 
 /**
  * List all categories
@@ -31,7 +32,7 @@ export function categoriesGetAll(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    Array<operations.ListCategoriesResponse>,
+    Array<operations.ListCategoriesResponse> | undefined,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -54,7 +55,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      Array<operations.ListCategoriesResponse>,
+      Array<operations.ListCategoriesResponse> | undefined,
       | SenseiProductivityError
       | ResponseValidationError
       | ConnectionError
@@ -88,8 +89,18 @@ async function $do(
     securitySource: client._options.bearerAuth,
     retryConfig: options?.retries
       || client._options.retryConfig
+      || {
+        strategy: "backoff",
+        backoff: {
+          initialInterval: 1000,
+          maxInterval: 60000,
+          exponent: 1.3,
+          maxElapsedTime: 3600000,
+        },
+        retryConnectionErrors: true,
+      }
       || { strategy: "none" },
-    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
+    retryCodes: options?.retryCodes || ["429", "5XX"],
   };
 
   const requestRes = client._createRequest(context, {
@@ -108,7 +119,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["401", "4XX", "5XX"],
+    errorCodes: ["429", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -118,7 +129,7 @@ async function $do(
   const response = doResult.value;
 
   const [result] = await M.match<
-    Array<operations.ListCategoriesResponse>,
+    Array<operations.ListCategoriesResponse> | undefined,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -128,8 +139,15 @@ async function $do(
     | UnexpectedClientError
     | SDKValidationError
   >(
-    M.json(200, z.array(operations.ListCategoriesResponse$inboundSchema)),
-    M.fail([401, "4XX"]),
+    M.json(
+      200,
+      types$.optional(z.array(operations.ListCategoriesResponse$inboundSchema)),
+    ),
+    M.nil(
+      401,
+      types$.optional(z.array(operations.ListCategoriesResponse$inboundSchema)),
+    ),
+    M.fail(429),
     M.fail("5XX"),
   )(response, req);
   if (!result.ok) {

package/src/funcs/categories-update.ts

@@ -24,6 +24,7 @@ import { SenseiProductivityError } from "../models/errors/sensei-productivity-er
 import * as operations from "../models/operations/index.js";
 import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
+import * as types$ from "../types/primitives.js";
 
 /**
  * Update a category (school admins only)
@@ -34,7 +35,7 @@ export function categoriesUpdate(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.UpdateCategoryResponse,
+    operations.UpdateCategoryResponse | undefined,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -59,7 +60,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.UpdateCategoryResponse,
+      operations.UpdateCategoryResponse | undefined,
       | SenseiProductivityError
       | ResponseValidationError
       | ConnectionError
@@ -112,8 +113,18 @@ async function $do(
     securitySource: client._options.bearerAuth,
     retryConfig: options?.retries
       || client._options.retryConfig
+      || {
+        strategy: "backoff",
+        backoff: {
+          initialInterval: 1000,
+          maxInterval: 60000,
+          exponent: 1.3,
+          maxElapsedTime: 3600000,
+        },
+        retryConnectionErrors: true,
+      }
       || { strategy: "none" },
-    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
+    retryCodes: options?.retryCodes || ["429", "5XX"],
   };
 
   const requestRes = client._createRequest(context, {
@@ -133,7 +144,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["400", "401", "403", "404", "4XX", "5XX"],
+    errorCodes: ["429", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -143,7 +154,7 @@ async function $do(
   const response = doResult.value;
 
   const [result] = await M.match<
-    operations.UpdateCategoryResponse,
+    operations.UpdateCategoryResponse | undefined,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -153,8 +164,15 @@ async function $do(
     | UnexpectedClientError
     | SDKValidationError
   >(
-    M.json(200, operations.UpdateCategoryResponse$inboundSchema),
-    M.fail([400, 401, 403, 404, "4XX"]),
+    M.json(
+      200,
+      types$.optional(operations.UpdateCategoryResponse$inboundSchema),
+    ),
+    M.nil(
+      [400, 401, 403, 404],
+      types$.optional(operations.UpdateCategoryResponse$inboundSchema),
+    ),
+    M.fail(429),
     M.fail("5XX"),
   )(response, req);
   if (!result.ok) {

package/src/funcs/schools-get-all.ts

@@ -88,8 +88,18 @@ async function $do(
     securitySource: client._options.bearerAuth,
     retryConfig: options?.retries
       || client._options.retryConfig
+      || {
+        strategy: "backoff",
+        backoff: {
+          initialInterval: 1000,
+          maxInterval: 60000,
+          exponent: 1.3,
+          maxElapsedTime: 3600000,
+        },
+        retryConnectionErrors: true,
+      }
       || { strategy: "none" },
-    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
+    retryCodes: options?.retryCodes || ["429", "5XX"],
   };
 
   const requestRes = client._createRequest(context, {
@@ -108,7 +118,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["4XX", "5XX"],
+    errorCodes: ["429", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -129,7 +139,7 @@ async function $do(
     | SDKValidationError
   >(
     M.json(200, z.array(operations.ListSchoolsResponse$inboundSchema)),
-    M.fail("4XX"),
+    M.fail(429),
     M.fail("5XX"),
   )(response, req);
   if (!result.ok) {