✨ Support for paginated data

Author: AnandChowdhary

src/controllers/organization.ts

@@ -299,7 +299,8 @@ export class OrganizationController {
     res.json(
       await getOrganizationMembershipsForUser(
         res.locals.token.id,
-        organizationId
+        organizationId,
+        req.params.start
       )
     );
   }

src/crud/data.ts

@@ -0,0 +1,29 @@
+import { query } from "../helpers/mysql";
+import { KeyValue } from "../interfaces/general";
+
+/*
+ * Get pagination data
+ */
+export const getPaginatedData = async (
+  table: string,
+  conditions?: KeyValue,
+  index = 0,
+  itemsPerPage = 5,
+  primaryKey = "id"
+) => {
+  const data = (await query(
+    `SELECT * FROM \`${table}\` WHERE ${primaryKey} > ? ${
+      conditions
+        ? `AND ${Object.keys(conditions)
+            .map(condition => `${condition} = ?`)
+            .join(" AND ")}`
+        : ""
+    } ORDER BY ${primaryKey} ASC LIMIT ${itemsPerPage}`,
+    [index, ...(conditions ? Object.values(conditions) : [])]
+  )) as any[];
+  return {
+    data,
+    has_more: data.length === itemsPerPage,
+    next: data.length && data[data.length - 1][primaryKey]
+  };
+};

src/crud/membership.ts

@@ -13,6 +13,7 @@ import { ErrorCode, CacheCategories } from "../interfaces/enum";
 import { deleteItemFromCache, cachedQuery } from "../helpers/cache";
 import { getUser } from "./user";
 import { Organization } from "../interfaces/tables/organization";
+import { getPaginatedData } from "./data";
 
 /*
  * Create a new organization membership for a user
@@ -166,8 +167,15 @@ export const getOrganizationMembers = async (organizationId: number) => {
 /*
  * Get a detailed list of all members in an organization
  */
-export const getOrganizationMemberDetails = async (organizationId: number) => {
-  const members: any = await getOrganizationMembers(organizationId);
+export const getOrganizationMemberDetails = async (
+  organizationId: number,
+  start?: number
+) => {
+  const members: any = await getPaginatedData(
+    "memberships",
+    { organizationId },
+    start
+  );
   for await (const member of members) {
     member.user = await getUser(member.userId);
   }

src/crud/user.ts

@@ -95,6 +95,7 @@ export const getUserByEmail = async (email: string, secureOrigin = false) => {
  */
 export const updateUser = async (id: number, user: KeyValue) => {
   user.updatedAt = dateToDateTime(new Date());
+  user.password = await hash(user.password || "", 8);
   user = removeReadOnlyValues(user);
   if (user.primaryEmail) {
     const originalUser = await getUser(id);

src/rest/auth.ts

@@ -150,8 +150,7 @@ export const updatePassword = async (
 ) => {
   validate(password, ValidationTypes.TEXT);
   const userId = (<KeyValue>await verifyToken(token, Tokens.PASSWORD_RESET)).id;
-  const hashedPassword = await hash(password || "", 8);
-  await updateUser(userId, { password: hashedPassword });
+  await updateUser(userId, { password });
   await createEvent(
     {
       userId,

src/rest/organization.ts

@@ -354,9 +354,10 @@ export const getOrganizationRecentEventsForUser = async (
 
 export const getOrganizationMembershipsForUser = async (
   userId: number,
-  organizationId: number
+  organizationId: number,
+  start?: number
 ) => {
   if (await can(userId, Authorizations.READ, "organization", organizationId))
-    return await getOrganizationMemberDetails(organizationId);
+    return await getOrganizationMemberDetails(organizationId, start);
   throw new Error(ErrorCode.INSUFFICIENT_PERMISSION);
 };