@aurora-interactive/sensei-productivity 1.3.0 → 1.5.0

package/rest-api/cypress.config.ts

@@ -8,8 +8,15 @@ export default defineConfig({
         // drop test artifacts
         async reseedUsersTable() {
           return await prisma.$transaction([
-            prisma.$executeRaw`DELETE FROM users WHERE user_id != 2;`,
-            prisma.$executeRaw`UPDATE users SET is_soft_deleted = 0, first_name = 'Unit', last_name = 'Test', username = 'UnitTester' WHERE user_id = 2;`
+            prisma.users.deleteMany({
+              where: {
+                user_id: {
+                  notIn: [2, 3]
+                }
+              }
+            }),
+            prisma.$executeRaw`UPDATE users SET is_soft_deleted = 0, first_name = 'Unit', last_name = 'Test', username = 'UnitTester' WHERE user_id = 2;`,
+            prisma.$executeRaw`UPDATE users SET is_soft_deleted = 0, first_name = 'Unit', last_name = 'Test Jr.', username = 'UnitTester2' WHERE user_id = 3;`,
           ]);
         },
 
@@ -43,8 +50,45 @@ export default defineConfig({
 
         async reseedUserActivityPostsTable() {
           return await prisma.$transaction([
-            prisma.$executeRaw`REPLACE INTO User_Activity_Posts (post_id, user_id, category_name, activity_id, post_date, post_status, caption) VALUES (1, 2, 'Professional', 1, '2026-02-28 22:15:02', 'public', 'This is a test post! Nothing much going on here...');`
+            prisma.$executeRaw`REPLACE INTO User_Activity_Posts (post_id, user_id, category_name, activity_id, post_date, post_status, caption) VALUES (1, 2, 'Professional', 1, '2026-02-28 22:15:02', 'public', 'This is a test post! Nothing much going on here...');`,
+            prisma.$executeRaw`REPLACE INTO User_Activity_Posts (post_id, user_id, category_name, activity_id, post_date, post_status, caption) VALUES (2, 3, 'Professional', 1, '2026-02-28 22:15:02', 'public', 'This is a test post! Nothing much going on here...');`
           ])
+        },
+
+        // tasks used for friend request unit tests to work correctly
+        async clearFriendRequestsTable() {
+          return await prisma.$transaction([
+            prisma.friend_Requests.deleteMany({})
+          ])
+        },
+
+        async prepAcceptedFriendRequests() {
+          const [res] = await prisma.$transaction([
+            prisma.friend_Requests.create({
+              data: {
+                friend_request_id: 1,
+                initiator_user_id: 2,
+                target_user_id: 3,
+                status: "accepted"
+              }
+            })
+          ]);
+          return !!res;
+        },
+
+        async prepPendingFriendRequests() {
+          const [res] = await prisma.$transaction([
+            prisma.friend_Requests.create({
+              data: {
+                friend_request_id: 1,
+                initiator_user_id: 2,
+                target_user_id: 3,
+                status: "pending"
+              }
+            })
+          ]);
+
+          return !!res;
         }
       })
     },

package/rest-api/index.js

@@ -9,6 +9,7 @@ import * as SchoolFunctions from "./routes/SchoolFunctions.js";
 import * as CategoryFunctions from "./routes/CategoryFunctions.js";
 import * as UserActivityFunctions from "./routes/UserActivityFunctions.js";
 import * as ActivityPostFunctions from "./routes/ActivityPostFunctions.js";
+import * as FriendFunctions from "./routes/FriendFunctions.js";
 
 const spec = yamlLoad(readFileSync("./api-spec.yaml"));
 
@@ -42,7 +43,13 @@ const handler = {
   getFeed: ActivityPostFunctions.getFeedHandler,
   getPostById: ActivityPostFunctions.getPostByIdHandler,
   updatePost: ActivityPostFunctions.updatePostHandler,
-  deletePost: ActivityPostFunctions.deletePostHandler
+  deletePost: ActivityPostFunctions.deletePostHandler,
+  listFriends: FriendFunctions.listFriendsHandler,
+  sendFriendRequest: FriendFunctions.sendFriendRequestHandler,
+  acceptFriendRequest: FriendFunctions.acceptFriendRequestHandler,
+  rejectFriendRequest: FriendFunctions.rejectFriendRequestHandler,
+  pendingFriendRequests: FriendFunctions.pendingFriendRequestsHandler,
+  removeFriend: FriendFunctions.removeFriendHandler
 };
 
 fastify.register(oasFastify, { spec, handler });

package/rest-api/lib/users.js

@@ -10,16 +10,18 @@ export async function getUserAuthInfo(prisma, accessToken) {
 }
 
 export async function areUsersFriends(prisma, userId, targetPotentialFriendId) {
-    const friendInfo = await prisma.User_Friends.findFirst({
+    const friendInfo = await prisma.Friend_Requests.findFirst({
         where: {
             OR: [
                 {
-                    user_id: userId,
-                    friend_id: targetPotentialFriendId,
+                    initiator_user_id: userId,
+                    target_user_id: targetPotentialFriendId,
+                    status: "accepted"
                 },
                 {
-                    user_id: targetPotentialFriendId,
-                    friend_id: userId,
+                    initiator_user_id: targetPotentialFriendId,
+                    target_user_id: userId,
+                    status: "accepted"
                 },
             ],
         },

package/rest-api/routes/ActivityPostFunctions.js

@@ -63,8 +63,79 @@ export async function getFeedHandler(request, reply, fastify) {
         return;
     }
 
-    // TODO implement getting posts feed once friending is done
-    reply.status(501);
+    const limit = Math.min(request.query.limit ?? 100, 100);
+    const lastPostId = request.query.lastPostId ?? -1;
+
+    const friendIdsInfo = await fastify.prisma.Friend_Requests.findMany({
+        where: {
+            OR: [
+                {
+                    initiator_user_id: userInfo.user_id,
+                },
+                {
+                    target_user_id: userInfo.user_id
+
+                }
+            ]
+        },
+        select: {
+            users_Friend_Requests_target_user_idTousers: {
+                select: {
+                    user_id: true
+                }
+            },
+            users_Friend_Requests_initiator_user_idTousers: {
+                select: {
+                    user_id: true
+                }
+            }
+        }
+    });
+
+    const friendIds = friendIdsInfo.map(friendIdInfo => friendIdInfo.users_Friend_Requests_target_user_idTousers.user_id === userInfo.user_id ? friendIdInfo.users_Friend_Requests_initiator_user_idTousers.user_id : friendIdInfo.users_Friend_Requests_target_user_idTousers.user_id);
+
+    const posts = await fastify.prisma.User_Activity_Posts.findMany({
+        where: {
+            user_id: {
+                in: friendIds
+            }
+        },
+        select: {
+            post_id: true,
+            post_date: true,
+            post_status: true,
+            users: {
+                select: {
+                    user_id: true
+                }
+            },
+            Category: {
+                select: {
+                    category_name: true
+                }
+            },
+            User_Activity: {
+                select: {
+                    activity_id: true
+                }
+            }
+        },
+        orderBy: {
+            post_date: "desc"
+        },
+        take: limit,
+        cursor: lastPostId !== -1 ? { post_id: lastPostId } : undefined,
+        skip: lastPostId !== -1 ? 1 : undefined
+    });
+
+    return posts.map(post => ({
+        postId: post.post_id,
+        postDate: post.post_date,
+        postStatus: post.post_status,
+        userId: post.users.user_id,
+        categoryName: post.Category.category_name,
+        activityId: post.User_Activity.activity_id
+    }));
 }
 
 export async function getPostByIdHandler(request, reply, fastify) {

package/rest-api/routes/FriendFunctions.js

@@ -0,0 +1,266 @@
+import { getUserAuthInfo, areUsersFriends } from "../lib/users.js";
+
+export async function listFriendsHandler(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 targetUserCheck = await fastify.prisma.users.findFirst({
+        where: {
+            user_id: request.params.id
+        },
+        select: {
+            user_id: true
+        }
+    });
+    if (targetUserCheck === null) {
+        reply.status(404);
+        return;
+    }
+
+    const friendsList = await fastify.prisma.Friend_Requests.findMany({
+        where: {
+            OR: [
+                { initiator_user_id: request.params.id, status: "accepted" },
+                { target_user_id: request.params.id, status: "accepted" }
+            ]
+        },
+        select: {
+            users_Friend_Requests_initiator_user_idTousers: {
+                select: {
+                    user_id: true,
+                    first_name: true,
+                    last_name: true,
+                    username: true,
+                    email: true,
+                    school: {
+                        select: { school_id: true, school_name: true }
+                    }
+                }
+            },
+            users_Friend_Requests_target_user_idTousers: {
+                select: {
+                    user_id: true,
+                    first_name: true,
+                    last_name: true,
+                    username: true,
+                    email: true,
+                    school: {
+                        select: { school_id: true, school_name: true }
+                    }
+                }
+            }
+        }
+    });
+
+    return friendsList.map(friendEntry => {
+        // determine which side of the relationship is the friend (not the current user)
+        const friend = Number(friendEntry.users_Friend_Requests_initiator_user_idTousers.user_id) === request.params.id
+            ? friendEntry.users_Friend_Requests_target_user_idTousers
+            : friendEntry.users_Friend_Requests_initiator_user_idTousers;
+
+        return {
+            userId: Number(friend.user_id),
+            firstName: friend.first_name,
+            lastName: friend.last_name,
+            username: friend.username,
+            email: friend.email,
+            schoolId: Number(friend.school.school_id),
+            schoolName: friend.school.school_name,
+        };
+    });
+}
+
+export async function pendingFriendRequestsHandler(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 pendingFriendRequests = await fastify.prisma.Friend_Requests.findMany({
+        where: {
+            target_user_id: userInfo.user_id,
+            status: "pending"
+        },
+        select: {
+            users_Friend_Requests_initiator_user_idTousers: {
+                select: {
+                    user_id: true,
+                    first_name: true,
+                    last_name: true,
+                    username: true,
+                    email: true,
+                    school: {
+                        select: { school_id: true, school_name: true }
+                    }
+                }
+            }
+        }
+    });
+
+    return pendingFriendRequests.map(friendRequest => ({
+        userId: Number(friendRequest.users_Friend_Requests_initiator_user_idTousers.user_id),
+        firstName: friendRequest.users_Friend_Requests_initiator_user_idTousers.first_name,
+        lastName: friendRequest.users_Friend_Requests_initiator_user_idTousers.last_name,
+        username: friendRequest.users_Friend_Requests_initiator_user_idTousers.username,
+        email: friendRequest.users_Friend_Requests_initiator_user_idTousers.email,
+        schoolId: Number(friendRequest.users_Friend_Requests_initiator_user_idTousers.school.school_id),
+        schoolName: friendRequest.users_Friend_Requests_initiator_user_idTousers.school.school_name,
+    }));
+}
+
+export async function sendFriendRequestHandler(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 targetUserInfo = await fastify.prisma.users.findFirst({
+        where: {
+            user_id: request.params.id
+        },
+        select: {
+            user_id: true
+        }
+    });
+    if (targetUserInfo === null) {
+        reply.status(404);
+        return;
+    }
+
+    const areFriends = await areUsersFriends(fastify.prisma, userInfo.user_id, request.params.id);
+    if (areFriends) {
+        reply.status(400);
+        return;
+    }
+
+    await fastify.prisma.Friend_Requests.create({
+        data: {
+            initiator_user_id: userInfo.user_id,
+            target_user_id: request.params.id
+        }
+    });
+
+    reply.status(201);
+}
+
+// TODO move the core functionality code to a separate
+// library function since accept and reject friend request
+// are both very similar
+export async function acceptFriendRequestHandler(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 friendRequest = await fastify.prisma.Friend_Requests.findFirst({
+        where: {
+            target_user_id: userInfo.user_id,
+            initiator_user_id: request.params.id,
+            status: "pending"
+        },
+        select: {
+            friend_request_id: true
+        }
+    });
+
+    if (friendRequest === null) {
+        reply.status(404);
+        return;
+    }
+
+    await fastify.prisma.Friend_Requests.update({
+        where: {
+            friend_request_id: friendRequest.friend_request_id
+        },
+        data: {
+            status: "accepted"
+        }
+    });
+}
+
+export async function rejectFriendRequestHandler(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 friendRequest = await fastify.prisma.Friend_Requests.findFirst({
+        where: {
+            target_user_id: userInfo.user_id,
+            initiator_user_id: request.params.id,
+            status: "pending"
+        },
+        select: {
+            friend_request_id: true
+        }
+    });
+
+    if (friendRequest === null) {
+        reply.status(404);
+        return;
+    }
+
+    await fastify.prisma.Friend_Requests.delete({
+        where: {
+            friend_request_id: friendRequest.friend_request_id
+        }
+    });
+}
+
+export async function removeFriendHandler(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 friendship = await fastify.prisma.Friend_Requests.findFirst({
+        where: {
+            OR: [
+                {
+                    initiator_user_id: userInfo.user_id,
+                    target_user_id: request.params.friendId,
+                    status: "accepted"
+                },
+                {
+                    initiator_user_id: request.params.friendId,
+                    target_user_id: userInfo.user_id,
+                    status: "accepted"
+                },
+            ],
+        },
+        select: {
+            friend_request_id: true
+        }
+    });
+
+    if (friendship === null) {
+        reply.status(404);
+        return;
+    }
+
+    await fastify.prisma.Friend_Requests.delete({
+        where: {
+            friend_request_id: friendship.friend_request_id
+        }
+    });
+}

package/rest-api/routes/UserActivityFunctions.js

@@ -1,7 +1,7 @@
 import { getUserAuthInfo, areUsersFriends } from "../lib/users.js";
 
 export async function getUserActivitiesHandler(request, reply, fastify) {
-    const accessToken = (request.headers.authorization ?? "").substring(7)
+    const accessToken = (request.headers.authorization ?? "").substring(7);
     const targetUserId = request.params.id;
     const userInfo = await getUserAuthInfo(fastify.prisma, accessToken);
 

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
@@ -136,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,
   });
@@ -146,7 +147,7 @@ async function $do(
   const response = doResult.value;
 
   const [result] = await M.match<
-    operations.CreateCategoryResponse,
+    operations.CreateCategoryResponse | undefined,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -156,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

@@ -142,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,
   });
@@ -163,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
@@ -118,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,
   });
@@ -128,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
@@ -138,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
@@ -143,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,
   });
@@ -153,7 +154,7 @@ async function $do(
   const response = doResult.value;
 
   const [result] = await M.match<
-    operations.UpdateCategoryResponse,
+    operations.UpdateCategoryResponse | undefined,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -163,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

@@ -118,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,
   });
@@ -139,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) {