@aurora-interactive/sensei-productivity 1.1.2 → 1.3.0

package/rest-api/routes/ActivityPostFunctions.js

@@ -0,0 +1,208 @@
+import { getUserAuthInfo, areUsersFriends } from "../lib/users.js";
+
+export async function getUserPostsHandler(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 targetExistsCheck = await fastify.prisma.users.findFirst({
+        where: {
+            user_id: request.params.id
+        },
+        select: {
+            user_id: true
+        }
+    });
+    if (targetExistsCheck === null) {
+        reply.status(404);
+        return;
+    }
+
+    if (userInfo.user_id !== request.params.id) {
+        const areFriends = await areUsersFriends(fastify.prisma, userInfo.user_id, request.params.id);
+        if (!areFriends) {
+            // TODO implement private profile checks once we have user table columns for private profile boolean
+        }
+    }
+
+    const userPosts = await fastify.prisma.User_Activity_Posts.findMany({
+        where: {
+            user_id: userInfo.user_id
+        },
+        select: {
+            post_id: true,
+            category_name: true,
+            activity_id: true,
+            post_date: true,
+            post_status: true,
+            caption: true
+        }
+    });
+
+    return userPosts.map(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
+    }));
+}
+
+export async function getFeedHandler(request, reply, fastify) {
+    const accessToken = (request.headers.authorization ?? "").substring(7)
+    const userInfo = await getUserAuthInfo(fastify.prisma, accessToken);
+
+    if (userInfo === null) {
+        reply.status(401);
+        return;
+    }
+
+    // TODO implement getting posts feed once friending is done
+    reply.status(501);
+}
+
+export async function getPostByIdHandler(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 post = await fastify.prisma.User_Activity_Posts.findFirst({
+        where: {
+            post_id: request.params.id
+        },
+        select: {
+            post_id: true,
+            category_name: true,
+            activity_id: true,
+            post_date: true,
+            post_status: true,
+            caption: true,
+            user_id: true
+        }
+    });
+
+    if (post === null) {
+        reply.status(404);
+        return;
+    }
+
+    if (post.user_id !== userInfo.user_id) {
+        const areFriends = await areUsersFriends(fastify.prisma, userInfo.user_id, post.user_id);
+        if (!areFriends) {
+            // TODO implement private profile checks once we have user table columns for private profile boolean
+        }
+    }
+
+    return {
+        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
+    };
+}
+
+export async function updatePostHandler(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 currentPost = await fastify.prisma.User_Activity_Posts.findFirst({
+        where: {
+            post_id: request.params.id
+        },
+        select: {
+            user_id: true,
+            caption: true,
+            post_status: true
+        }
+    });
+
+    if (currentPost === null) {
+        reply.status(404);
+        return;
+    }
+
+    if (currentPost.user_id !== currentPost.user_id) {
+        reply.status(403);
+        return;
+    }
+
+    const targetCaption = request.body.caption ?? currentPost.caption;
+    const targetPostStatus = request.body.postStatus ?? currentPost.post_status;
+    const updatedPost = await fastify.prisma.User_Activity_Posts.update({
+        where: {
+            post_id: request.params.id
+        },
+        data: {
+            caption: targetCaption,
+            post_status: targetPostStatus
+        }
+    });
+
+    return {
+        postId: updatedPost.post_id,
+        userId: userInfo.user_id,
+        categoryName: updatedPost.category_name,
+        activityId: updatedPost.activity_id,
+        postDate: updatedPost.post_date,
+        postStatus: updatedPost.post_status,
+        caption: updatedPost.caption
+    };
+}
+
+export async function deletePostHandler(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;
+    }
+
+    if (postCheck.user_id !== postCheck.user_id) {
+        reply.status(403);
+        return;
+    }
+
+    await fastify.prisma.User_Activity_Posts.delete({
+        where: {
+            post_id: request.params.id
+        }
+    });
+}

package/rest-api/routes/UserActivityFunctions.js

@@ -1,36 +1,4 @@
-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;
-}
+import { getUserAuthInfo, areUsersFriends } from "../lib/users.js";
 
 export async function getUserActivitiesHandler(request, reply, fastify) {
     const accessToken = (request.headers.authorization ?? "").substring(7)

package/rest-api/routes/UserFunctions.js

@@ -3,27 +3,23 @@ import { randomBytes } from "node:crypto";
 
 async function getUserProfile(prisma, userId = null, accessToken = null) {
     return await prisma.users.findFirst({
-        include: {
-            school: true
-        },
-        // TODO: optimize this section to minimize data transfer
-        // Ex: we don't need to select *all* of the school info
-        // and *all* of the user info
-        // but Prisma ORM doesn't currently allow both `select` and `include` at the same time
-
-        // select: {
-        //     user_id: true,
-        //     username: true,
-        //     first_name: true,
-        //     last_name: true,
-        //     email: true,
-        //     school_id: true,
-        //     school_name: true
-        // },
         where: {
-            access_token: accessToken !== null ? accessToken : undefined,
-            user_id: userId !== null ? userId : undefined,
+            access_token: accessToken ?? undefined,
+            user_id: userId ?? undefined,
             is_soft_deleted: false
+        },
+        select: {
+            user_id: true,
+            username: true,
+            first_name: true,
+            last_name: true,
+            email: true,
+            school: {
+                select: {
+                    school_id: true,
+                    school_name: true
+                }
+            }
         }
     });
 }
@@ -108,7 +104,7 @@ export async function getCurrentUserHandler(request, reply, fastify) {
         userId: user.user_id,
         firstName: user.first_name,
         lastName: user.last_name,
-        schoolId: user.school_id,
+        schoolId: user.school.school_id,
         email: user.email,
         username: user.username,
         schoolName: user.school.school_name
@@ -132,7 +128,7 @@ export async function getUserByIdHandler(request, reply, fastify) {
         userId: user.user_id,
         firstName: user.first_name,
         lastName: user.last_name,
-        schoolId: user.school_id,
+        schoolId: user.school.school_id,
         email: user.email,
         username: user.username,
         schoolName: user.school.school_name
@@ -158,8 +154,18 @@ export async function updateUserHandler(request, reply, fastify) {
     }
 
     const userInfo = await fastify.prisma.users.findFirst({
-        include: {
-            school: true
+        select: {
+            user_id: true,
+            username: true,
+            first_name: true,
+            last_name: true,
+            email: true,
+            school: {
+                select: {
+                    school_id: true,
+                    school_name: true,
+                }
+            }
         },
         where: {
             access_token: request.headers.authorization.substring(7)
@@ -197,7 +203,7 @@ export async function updateUserHandler(request, reply, fastify) {
         firstName: targetFirstName,
         lastName: targetLastName,
         email: userInfo.email,
-        schoolId: userInfo.school_id,
+        schoolId: userInfo.school.school_id,
         schoolName: userInfo.school.school_name
     };
 }

package/src/funcs/categories-create.ts

@@ -24,7 +24,6 @@ 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)
@@ -35,7 +34,7 @@ export function categoriesCreate(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.CreateCategoryResponse | undefined,
+    operations.CreateCategoryResponse,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -60,7 +59,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.CreateCategoryResponse | undefined,
+      operations.CreateCategoryResponse,
       | SenseiProductivityError
       | ResponseValidationError
       | ConnectionError
@@ -137,7 +136,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["429", "5XX"],
+    errorCodes: ["400", "401", "403", "4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -147,7 +146,7 @@ async function $do(
   const response = doResult.value;
 
   const [result] = await M.match<
-    operations.CreateCategoryResponse | undefined,
+    operations.CreateCategoryResponse,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -157,15 +156,8 @@ async function $do(
     | UnexpectedClientError
     | SDKValidationError
   >(
-    M.json(
-      201,
-      types$.optional(operations.CreateCategoryResponse$inboundSchema),
-    ),
-    M.nil(
-      [400, 401, 403],
-      types$.optional(operations.CreateCategoryResponse$inboundSchema),
-    ),
-    M.fail(429),
+    M.json(201, operations.CreateCategoryResponse$inboundSchema),
+    M.fail([400, 401, 403, "4XX"]),
     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: ["429", "5XX"],
+    errorCodes: ["401", "403", "404", "4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -163,8 +163,7 @@ async function $do(
     | SDKValidationError
   >(
     M.nil(200, z.void()),
-    M.nil([401, 403, 404], z.void()),
-    M.fail(429),
+    M.fail([401, 403, 404, "4XX"]),
     M.fail("5XX"),
   )(response, req);
   if (!result.ok) {

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

@@ -22,7 +22,6 @@ 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
@@ -32,7 +31,7 @@ export function categoriesGetAll(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    Array<operations.ListCategoriesResponse> | undefined,
+    Array<operations.ListCategoriesResponse>,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -55,7 +54,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      Array<operations.ListCategoriesResponse> | undefined,
+      Array<operations.ListCategoriesResponse>,
       | SenseiProductivityError
       | ResponseValidationError
       | ConnectionError
@@ -119,7 +118,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["429", "5XX"],
+    errorCodes: ["401", "4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -129,7 +128,7 @@ async function $do(
   const response = doResult.value;
 
   const [result] = await M.match<
-    Array<operations.ListCategoriesResponse> | undefined,
+    Array<operations.ListCategoriesResponse>,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -139,15 +138,8 @@ async function $do(
     | UnexpectedClientError
     | SDKValidationError
   >(
-    M.json(
-      200,
-      types$.optional(z.array(operations.ListCategoriesResponse$inboundSchema)),
-    ),
-    M.nil(
-      401,
-      types$.optional(z.array(operations.ListCategoriesResponse$inboundSchema)),
-    ),
-    M.fail(429),
+    M.json(200, z.array(operations.ListCategoriesResponse$inboundSchema)),
+    M.fail([401, "4XX"]),
     M.fail("5XX"),
   )(response, req);
   if (!result.ok) {

package/src/funcs/categories-update.ts

@@ -24,7 +24,6 @@ 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)
@@ -35,7 +34,7 @@ export function categoriesUpdate(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.UpdateCategoryResponse | undefined,
+    operations.UpdateCategoryResponse,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -60,7 +59,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.UpdateCategoryResponse | undefined,
+      operations.UpdateCategoryResponse,
       | SenseiProductivityError
       | ResponseValidationError
       | ConnectionError
@@ -144,7 +143,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["429", "5XX"],
+    errorCodes: ["400", "401", "403", "404", "4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -154,7 +153,7 @@ async function $do(
   const response = doResult.value;
 
   const [result] = await M.match<
-    operations.UpdateCategoryResponse | undefined,
+    operations.UpdateCategoryResponse,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -164,15 +163,8 @@ async function $do(
     | UnexpectedClientError
     | SDKValidationError
   >(
-    M.json(
-      200,
-      types$.optional(operations.UpdateCategoryResponse$inboundSchema),
-    ),
-    M.nil(
-      [400, 401, 403, 404],
-      types$.optional(operations.UpdateCategoryResponse$inboundSchema),
-    ),
-    M.fail(429),
+    M.json(200, operations.UpdateCategoryResponse$inboundSchema),
+    M.fail([400, 401, 403, 404, "4XX"]),
     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: ["429", "5XX"],
+    errorCodes: ["4XX", "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(429),
+    M.fail("4XX"),
     M.fail("5XX"),
   )(response, req);
   if (!result.ok) {

package/src/funcs/schools-get.ts

@@ -24,7 +24,6 @@ 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
@@ -35,7 +34,7 @@ export function schoolsGet(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.GetSchoolByIdResponse | undefined,
+    operations.GetSchoolByIdResponse,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -60,7 +59,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.GetSchoolByIdResponse | undefined,
+      operations.GetSchoolByIdResponse,
       | SenseiProductivityError
       | ResponseValidationError
       | ConnectionError
@@ -143,7 +142,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["429", "5XX"],
+    errorCodes: ["404", "4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -153,7 +152,7 @@ async function $do(
   const response = doResult.value;
 
   const [result] = await M.match<
-    operations.GetSchoolByIdResponse | undefined,
+    operations.GetSchoolByIdResponse,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -163,12 +162,8 @@ async function $do(
     | UnexpectedClientError
     | SDKValidationError
   >(
-    M.json(
-      200,
-      types$.optional(operations.GetSchoolByIdResponse$inboundSchema),
-    ),
-    M.nil(404, types$.optional(operations.GetSchoolByIdResponse$inboundSchema)),
-    M.fail(429),
+    M.json(200, operations.GetSchoolByIdResponse$inboundSchema),
+    M.fail([404, "4XX"]),
     M.fail("5XX"),
   )(response, req);
   if (!result.ok) {

package/src/funcs/{user-activities-create.ts → users-activities-create.ts}

@@ -24,18 +24,17 @@ 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
  */
-export function userActivitiesCreate(
+export function usersActivitiesCreate(
   client: SenseiProductivityCore,
   request: operations.CreateActivityRequest,
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.CreateActivityResponse | undefined,
+    operations.CreateActivityResponse,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -60,7 +59,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.CreateActivityResponse | undefined,
+      operations.CreateActivityResponse,
       | SenseiProductivityError
       | ResponseValidationError
       | ConnectionError
@@ -137,7 +136,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["429", "5XX"],
+    errorCodes: ["400", "401", "4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -147,7 +146,7 @@ async function $do(
   const response = doResult.value;
 
   const [result] = await M.match<
-    operations.CreateActivityResponse | undefined,
+    operations.CreateActivityResponse,
     | SenseiProductivityError
     | ResponseValidationError
     | ConnectionError
@@ -157,15 +156,8 @@ async function $do(
     | UnexpectedClientError
     | SDKValidationError
   >(
-    M.json(
-      201,
-      types$.optional(operations.CreateActivityResponse$inboundSchema),
-    ),
-    M.nil(
-      [400, 401],
-      types$.optional(operations.CreateActivityResponse$inboundSchema),
-    ),
-    M.fail(429),
+    M.json(201, operations.CreateActivityResponse$inboundSchema),
+    M.fail([400, 401, "4XX"]),
     M.fail("5XX"),
   )(response, req);
   if (!result.ok) {