🛠️ Refactor: Add created_by to pending requests (#102)

* implement yousef's feedback

* add created by

* fix bug where createdBy not displaying after rejecting

client/components/Card.jsx

@@ -3,6 +3,7 @@ import Image from "next/image";
 import { useRouter } from "next/router";
 import React from "react";
 import {
+  FaCalendar,
   FaDiscord,
   FaRegSnowflake,
   FaSun,
@@ -16,6 +17,7 @@ const termToIcon = {
   Fall: GiChestnutLeaf,
   Winter: FaRegSnowflake,
   Summer: FaSun,
+  Year: FaCalendar,
 };
 
 const LinkIcon = ({ link, titleColor }) => (
@@ -41,7 +43,8 @@ const CourseInfo = ({ descriptionColor, campus, term, year }) => (
       as="h2"
       isTruncated
     >
-      {campus} <Icon as={termToIcon[term]} /> {year}
+      {campus} {year !== "N/A" ? year : ""}{" "}
+      {term !== "N/A" && <Icon as={termToIcon[term]} />}
     </Box>
   </>
 );

client/components/RequestsList.jsx

@@ -14,7 +14,13 @@ import React from "react";
 
 import { statuses } from "../constants";
 
-const ChatRequestCard = ({ showRequestBtns, modifyRequest, name, id }) => {
+const ChatRequestCard = ({
+  showRequestBtns,
+  modifyRequest,
+  name,
+  id,
+  createdBy,
+}) => {
   const { locale, defaultLocale, push } = useRouter();
   return (
     <Box
@@ -31,6 +37,8 @@ const ChatRequestCard = ({ showRequestBtns, modifyRequest, name, id }) => {
         </Link>
       </Heading>
       <Spacer />
+      <Text m={7}>{createdBy}</Text>
+      <Spacer />
       {showRequestBtns ? (
         <>
           <IconButton

client/gql/Admin.js

@@ -10,10 +10,12 @@ export const GET_ADMIN_DATA = gql`
     pendingChats: getGroupChatByStatus(status: $status1) {
       id
       name
+      createdBy
     }
     rejectedChats: getGroupChatByStatus(status: $status2) {
       id
       name
+      createdBy
     }
     users: getUsers(limit: $limit) {
       email

client/gql/GroupChat.js

@@ -161,6 +161,7 @@ export const UPDATE_GROUPCHAT_STATUS = gql`
     updateStatus(id: $id, status: $status) {
       name
       id
+      createdBy
     }
   }
 `;

client/pages/admin/index.jsx

@@ -39,11 +39,14 @@ export default function Admin() {
   }, []);
 
   const modifyRequest = async (id, status) => {
-    const { name, groupChatId } = await modifyGroupchatStatus(id, status);
+    const { name, groupChatId, createdBy } = await modifyGroupchatStatus(
+      id,
+      status
+    );
     if (status === "rejected") {
       setRejected((rejectedGroups) => [
         ...rejectedGroups,
-        { id: groupChatId, name },
+        { id: groupChatId, name, createdBy },
       ]);
     }
     setPending((pendingGroups) =>

client/requests/groupChats.js

@@ -74,7 +74,7 @@ export async function getGroupchatReq(id) {
 export async function modifyGroupchatStatus(id, status) {
   const {
     data: {
-      updateStatus: { name, id: groupChatId },
+      updateStatus: { name, id: groupChatId, createdBy },
     },
   } = await client.mutate({
     mutation: UPDATE_GROUPCHAT_STATUS,
@@ -83,7 +83,7 @@ export async function modifyGroupchatStatus(id, status) {
       status,
     },
   });
-  return { name, groupChatId };
+  return { name, groupChatId, createdBy };
 }
 
 export async function searchChats(

server/dist/models/Groupchat.d.ts

@@ -9,6 +9,7 @@ export declare class GroupChat {
     id: string;
     name: string;
     description: string;
+    createdBy: string;
     links: string[];
     isCommunity: boolean;
     courseInformation?: CourseInformation;

server/models/Groupchat.ts

@@ -21,6 +21,8 @@ export class GroupChat {
 
   @Field() description: string;
 
+  @Field() createdBy: string;
+
   @Field(() => [String])
   links: string[];