@aurora-interactive/sensei-productivity 1.6.0 → 1.8.0

package/rest-api/cypress/e2e/activity-post-endpoints.cy.js

@@ -235,4 +235,82 @@ describe('User Activity Posts Endpoints Unit Tests', () => {
             expect(response.status).to.equal(200, "Deleting post by ID should have succeeded; got non-success code instead!");
         });
     });
+
+    // Liking post
+    it('Liking post by ID should fail due to invalid bearer token', () => {
+        cy.request({
+            failOnStatusCode: false,
+            method: "patch",
+            url: "posts/1/like",
+            headers: {
+                "Authorization": "Bearer invalidBearer"
+            },
+        }).then(response => {
+            expect(response.status).to.equal(401, "Liking post by ID should have failed with HTTP 401; different code was found instead!");
+        });
+    });
+
+    it('Liking post by ID should fail due to invalid post ID', () => {
+        cy.request({
+            failOnStatusCode: false,
+            method: "patch",
+            url: "posts/99/like",
+            headers: {
+                "Authorization": "Bearer 9d2272fd048bfeedda522935244fc4450fb61a9da6f7b7cea529c6c11033e9efee6b140b6e4b372f0c81a07a6e040be5150f506922e8a5c47719f7be2c707252"
+            },
+        }).then(response => {
+            expect(response.status).to.equal(404, "Liking post by ID should have failed with HTTP 404; different code was found instead!");
+        });
+    });
+
+    it('Liking post should succeed', () => {
+        cy.request({
+            method: "patch",
+            url: "posts/1/like",
+            headers: {
+                "Authorization": "Bearer 9d2272fd048bfeedda522935244fc4450fb61a9da6f7b7cea529c6c11033e9efee6b140b6e4b372f0c81a07a6e040be5150f506922e8a5c47719f7be2c707252"
+            },
+        }).then(response => {
+            expect(response.status).to.equal(200, "Liking post by ID should have succeeded; got non-success code instead!");
+        });
+    });
+
+    // Unliking post
+    it('Unliking post by ID should fail due to invalid bearer token', () => {
+        cy.request({
+            failOnStatusCode: false,
+            method: "delete",
+            url: "posts/1/like",
+            headers: {
+                "Authorization": "Bearer invalidBearer"
+            },
+        }).then(response => {
+            expect(response.status).to.equal(401, "Unliking post by ID should have failed with HTTP 404; different code was found instead!");
+        });
+    });
+
+    it('Unliking post by ID should fail due to invalid post ID', () => {
+        cy.request({
+            failOnStatusCode: false,
+            method: "delete",
+            url: "posts/99/like",
+            headers: {
+                "Authorization": "Bearer 9d2272fd048bfeedda522935244fc4450fb61a9da6f7b7cea529c6c11033e9efee6b140b6e4b372f0c81a07a6e040be5150f506922e8a5c47719f7be2c707252"
+            },
+        }).then(response => {
+            expect(response.status).to.equal(404, "Unliking post by ID should have failed with HTTP 404; different code was found instead!");
+        });
+    });
+
+    it('Unliking post should succeed', () => {
+        cy.request({
+            method: "delete",
+            url: "posts/1/like",
+            headers: {
+                "Authorization": "Bearer 9d2272fd048bfeedda522935244fc4450fb61a9da6f7b7cea529c6c11033e9efee6b140b6e4b372f0c81a07a6e040be5150f506922e8a5c47719f7be2c707252"
+            },
+        }).then(response => {
+            expect(response.status).to.equal(200, "Unliking post by ID should have succeeded; got non-success code instead!");
+        });
+    });
 });

package/rest-api/cypress.config.ts

@@ -50,6 +50,7 @@ export default defineConfig({
 
         async reseedUserActivityPostsTable() {
           return await prisma.$transaction([
+            prisma.likes.deleteMany({}),
             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...');`
           ])

package/rest-api/index.js

@@ -44,6 +44,8 @@ const handler = {
   getPostById: ActivityPostFunctions.getPostByIdHandler,
   updatePost: ActivityPostFunctions.updatePostHandler,
   deletePost: ActivityPostFunctions.deletePostHandler,
+  likePost: ActivityPostFunctions.likePostHandler,
+  unlikePost: ActivityPostFunctions.unlikePostHandler,
   listFriends: FriendFunctions.listFriendsHandler,
   sendFriendRequest: FriendFunctions.sendFriendRequestHandler,
   acceptFriendRequest: FriendFunctions.acceptFriendRequestHandler,

package/rest-api/routes/ActivityPostFunctions.js

@@ -1,5 +1,27 @@
 import { getUserAuthInfo, areUsersFriends } from "../lib/users.js";
 
+//! Note: this function safely assumes that
+// a valid post with `postId` exists in the DB
+async function getLikesForPost(postId, prisma) {
+    return await prisma.Likes.count({
+        where: {
+            post_id: postId
+        }
+    });
+}
+
+async function userHasAlreadyLikedPost(postId, userId, prisma) {
+    return (await prisma.Likes.findFirst({
+        where: {
+            post_id: postId,
+            user_id: userId
+        },
+        select: {
+            like_id: true
+        }
+    })) !== null;
+}
+
 export async function getUserPostsHandler(request, reply, fastify) {
     const accessToken = (request.headers.authorization ?? "").substring(7)
     const userInfo = await getUserAuthInfo(fastify.prisma, accessToken);
@@ -43,15 +65,17 @@ export async function getUserPostsHandler(request, reply, fastify) {
         }
     });
 
-    return userPosts.map(post => ({
+    return await Promise.all(userPosts.map(async post => ({
         postId: post.post_id,
         userId: userInfo.user_id,
         categoryName: post.category_name,
         activityId: post.activity_id,
         postDate: post.post_date,
         postStatus: post.post_status,
-        caption: post.caption
-    }));
+        caption: post.caption,
+        likes: await getLikesForPost(post.post_id, fastify.prisma),
+        likedByCurrentUser: userHasAlreadyLikedPost(post.post_id, userInfo.user_id, fastify.prisma)
+    })));
 }
 
 export async function getFeedHandler(request, reply, fastify) {
@@ -97,7 +121,7 @@ export async function getFeedHandler(request, reply, fastify) {
     const posts = await fastify.prisma.User_Activity_Posts.findMany({
         where: {
             user_id: {
-                in: friendIds
+                in: [...friendIds, userInfo.user_id]
             }
         },
         select: {
@@ -121,21 +145,23 @@ export async function getFeedHandler(request, reply, fastify) {
             }
         },
         orderBy: {
-            post_date: "desc"
+            post_id: "asc"
         },
         take: limit,
         cursor: lastPostId !== -1 ? { post_id: lastPostId } : undefined,
         skip: lastPostId !== -1 ? 1 : undefined
     });
 
-    return posts.map(post => ({
+    return await Promise.all(posts.sort((a, b) => b.post_id - a.post_id).map(async 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
-    }));
+        activityId: post.User_Activity.activity_id,
+        likes: await getLikesForPost(post.post_id, fastify.prisma),
+        likedByCurrentUser: userHasAlreadyLikedPost(post.post_id, userInfo.user_id, fastify.prisma)
+    })));
 }
 
 export async function getPostByIdHandler(request, reply, fastify) {
@@ -181,7 +207,9 @@ export async function getPostByIdHandler(request, reply, fastify) {
         activityId: post.activity_id,
         postDate: post.post_date,
         postStatus: post.post_status,
-        caption: post.caption
+        caption: post.caption,
+        likes: await getLikesForPost(post.post_id, fastify.prisma),
+        likedByCurrentUser: userHasAlreadyLikedPost(post.post_id, userInfo.user_id, fastify.prisma)
     };
 }
 
@@ -276,4 +304,73 @@ export async function deletePostHandler(request, reply, fastify) {
             post_id: request.params.id
         }
     });
-}
+}
+
+export async function likePostHandler(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 postCheck = await fastify.prisma.User_Activity_Posts.findFirst({
+        where: {
+            post_id: request.params.id
+        },
+        select: {
+            user_id: true
+        }
+    });
+
+    if (postCheck === null) {
+        reply.status(404);
+        return;
+    }
+
+    // like only if user hasn't liked the post yet
+    if (!(await userHasAlreadyLikedPost(request.params.id, userInfo.user_id, fastify.prisma))) {
+        await fastify.prisma.Likes.create({
+            data: {
+                post_id: request.params.id,
+                user_id: userInfo.user_id
+            }
+        });
+    }
+}
+
+export async function unlikePostHandler(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 postCheck = await fastify.prisma.User_Activity_Posts.findFirst({
+        where: {
+            post_id: request.params.id
+        },
+        select: {
+            user_id: true
+        }
+    });
+
+    if (postCheck === null) {
+        reply.status(404);
+        return;
+    }
+
+    try {
+        await fastify.prisma.Likes.delete({
+            where: {
+                post_id_user_id: {
+                    user_id: userInfo.user_id,
+                    post_id: request.params.id
+                }
+            }
+        });
+    } catch{} // will except if no record found to delete, but this is normal if the user hasn't liked the post
+}

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

@@ -89,7 +89,6 @@ async function $do(
       charEncoding: "percent",
     }),
   };
-
   const path = pathToFunc("/api/v1/categories/{id}")(pathParams);
 
   const headers = new Headers(compactMap({
@@ -142,7 +141,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 +162,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
@@ -89,7 +90,6 @@ async function $do(
       charEncoding: "percent",
     }),
   };
-
   const path = pathToFunc("/api/v1/categories/{id}")(pathParams);
 
   const headers = new Headers(compactMap({
@@ -143,7 +143,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 +153,7 @@ async function $do(
   const response = doResult.value;
 
   const [result] = await M.match<
-    operations.UpdateCategoryResponse,
+    operations.UpdateCategoryResponse | undefined,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -163,8 +163,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) {

package/src/funcs/schools-get.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";
 
 /**
  * Get a school's details by ID
@@ -34,7 +35,7 @@ export function schoolsGet(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.GetSchoolByIdResponse,
+    operations.GetSchoolByIdResponse | undefined,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -59,7 +60,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.GetSchoolByIdResponse,
+      operations.GetSchoolByIdResponse | undefined,
       | SenseiProductivityError
       | ResponseValidationError
       | ConnectionError
@@ -89,7 +90,6 @@ async function $do(
       charEncoding: "percent",
     }),
   };
-
   const path = pathToFunc("/api/v1/schools/{id}")(pathParams);
 
   const headers = new Headers(compactMap({
@@ -142,7 +142,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["404", "4XX", "5XX"],
+    errorCodes: ["429", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -152,7 +152,7 @@ async function $do(
   const response = doResult.value;
 
   const [result] = await M.match<
-    operations.GetSchoolByIdResponse,
+    operations.GetSchoolByIdResponse | undefined,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -162,8 +162,12 @@ async function $do(
     | UnexpectedClientError
     | SDKValidationError
   >(
-    M.json(200, operations.GetSchoolByIdResponse$inboundSchema),
-    M.fail([404, "4XX"]),
+    M.json(
+      200,
+      types$.optional(operations.GetSchoolByIdResponse$inboundSchema),
+    ),
+    M.nil(404, types$.optional(operations.GetSchoolByIdResponse$inboundSchema)),
+    M.fail(429),
     M.fail("5XX"),
   )(response, req);
   if (!result.ok) {

package/src/funcs/users-activities-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 activity
@@ -34,7 +35,7 @@ export function usersActivitiesCreate(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.CreateActivityResponse,
+    operations.CreateActivityResponse | undefined,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -59,7 +60,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.CreateActivityResponse,
+      operations.CreateActivityResponse | undefined,
       | SenseiProductivityError
       | ResponseValidationError
       | ConnectionError
@@ -136,7 +137,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["400", "401", "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.CreateActivityResponse,
+    operations.CreateActivityResponse | undefined,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -156,8 +157,15 @@ async function $do(
     | UnexpectedClientError
     | SDKValidationError
   >(
-    M.json(201, operations.CreateActivityResponse$inboundSchema),
-    M.fail([400, 401, "4XX"]),
+    M.json(
+      201,
+      types$.optional(operations.CreateActivityResponse$inboundSchema),
+    ),
+    M.nil(
+      [400, 401],
+      types$.optional(operations.CreateActivityResponse$inboundSchema),
+    ),
+    M.fail(429),
     M.fail("5XX"),
   )(response, req);
   if (!result.ok) {

package/src/funcs/users-activities-delete.ts

@@ -89,7 +89,6 @@ async function $do(
       charEncoding: "percent",
     }),
   };
-
   const path = pathToFunc("/api/v1/activities/{id}")(pathParams);
 
   const headers = new Headers(compactMap({
@@ -142,7 +141,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 +162,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) {