Merge pull request #66 from avantifellows/main

Prod deployment
avantifellows · Nov 30, 2024 · 9d777bb · 9d777bb
2 parents 6c2e114 + d275620
commit 9d777bb
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 28 deletions.
diff --git a/api/afdb/session.ts b/api/afdb/session.ts
@@ -5,11 +5,18 @@ import getFetchConfig from '../fetchConfig';
 const url = process.env.AF_DB_SERVICE_URL;
 const bearerToken = process.env.AF_DB_SERVICE_BEARER_TOKEN || '';
 
-export const getSessionOccurrences = async (sessionId: string) => {
+export const getSessionOccurrences = async (sessionIds: string[]) => {
   try {
     const queryParams = new URLSearchParams();
-    if (sessionId) queryParams.append('session_id', sessionId.toString());
-    const urlWithParams = `${url}/session-occurrence?${queryParams.toString()}&is_start_time=today`;
+
+    if (sessionIds && sessionIds.length > 0) {
+      queryParams.append('session_ids', sessionIds.join(','));
+    }
+
+    queryParams.append('is_start_time', 'today');
+
+    const urlWithParams = `${url}/session-occurrence?${queryParams.toString()}`;
+
     const response = await fetch(urlWithParams, getFetchConfig(bearerToken));
 
     if (!response.ok) {

diff --git a/app/library/page.tsx b/app/library/page.tsx
@@ -11,11 +11,13 @@ import BlueprintIcon from '../../assets/blueprint.png';
 import { MixpanelTracking } from '@/services/mixpanel';
 import { MIXPANEL_EVENT } from '@/constants/config';
 import { useAuth } from '@/services/AuthContext';
+import { getGroupConfig } from '@/config/groupConfig';
 
 const Page: React.FC = () => {
   const [selectedLibrary, setSelectedLibrary] = useState<string | null>('Content');
   const { push } = useRouter();
   const { group } = useAuth();
+  const groupConfig = getGroupConfig(group || 'defaultGroup');
 
   const handleLibraryChange = (library: string) => {
     setSelectedLibrary(library);
@@ -47,7 +49,7 @@ const Page: React.FC = () => {
           >
             Content Library
           </PrimaryButton>
-          {group !== 'EnableStudents' && group !== 'AllIndiaStudents' && (
+          {groupConfig.showClassLibrary && (
             <PrimaryButton
               onClick={() => handleLibraryChange('Class')}
               className={`${buttonStyle} ${selectedLibrary === 'Class' ? selectedButtonStyle : unselectedButtonStyle}`}

diff --git a/app/page.tsx b/app/page.tsx
@@ -12,9 +12,11 @@ import Loading from "./loading";
 import { formatCurrentTime, formatSessionTime, formatQuizSessionTime, formatTime, isSessionActive, format12HrSessionTime } from "@/utils/dateUtils";
 import { api } from "@/services/url";
 import { MixpanelTracking } from "@/services/mixpanel";
+import { getGroupConfig } from "@/config/groupConfig";
 
 export default function Home() {
   const { loggedIn, userId, userDbId, group } = useAuth();
+  const groupConfig = getGroupConfig(group || 'defaultGroup');
   const [liveClasses, setLiveClasses] = useState<SessionOccurrence[]>([]);
   const [isLoading, setIsLoading] = useState(true);
   const [quizzes, setQuizzes] = useState<QuizSession[]>([]);
@@ -77,37 +79,33 @@ export default function Home() {
 
   const fetchUserSessions = async () => {
     try {
+      const groupConfig = getGroupConfig(group || 'defaultGroup');
+      const shouldFetchQuizzes = groupConfig.showTests || groupConfig.showPracticeTests || groupConfig.showHomework;
+
       const [liveSessionData, quizSessionData] = await Promise.all([
-        group !== 'AllIndiaStudents' ? fetchUserSession(userDbId!) : Promise.resolve([]),
-        fetchUserSession(userDbId!, true)
+        groupConfig.showLiveClasses ? fetchUserSession(userDbId!) : Promise.resolve([]),
+        shouldFetchQuizzes ? fetchUserSession(userDbId!, true) : Promise.resolve([])
       ]);
 
-      const quizData = await Promise.all(quizSessionData.map(async (quiz: Session) => {
-        const sessionOccurrenceData = await getSessionOccurrences(quiz.session_id);
-        if (!sessionOccurrenceData) return null;
-        return sessionOccurrenceData;
-      }));
-      const flattenedQuizData = quizData.flat();
-      const quizSessions = flattenedQuizData.filter(flattenedSessionsData => flattenedSessionsData.session.platform === 'quiz');
+      const sessionIds = [...liveSessionData, ...quizSessionData].map(session => session.session_id);
+
+      const sessionOccurrences = await getSessionOccurrences(sessionIds);
+
+      const quizSessions = sessionOccurrences
+        .filter((sessionOccurence: SessionOccurrence) => sessionOccurence.session.platform === 'quiz');
       setQuizzes(quizSessions);
 
-      if (group !== 'AllIndiaStudents') {
-        const sessionsData = await Promise.all(liveSessionData.map(async (liveSession: Session) => {
-          const sessionOccurrenceData = await getSessionOccurrences(liveSession.session_id);
-          if (!sessionOccurrenceData) return null;
-          return sessionOccurrenceData;
-        }));
-        const flattenedSessionsData = sessionsData.flat();
-        const liveSessions = flattenedSessionsData.filter(flattenedSessionsData => flattenedSessionsData.session.platform === 'meet');
-        setLiveClasses(liveSessions);
-      }
+      const liveSessions = sessionOccurrences
+        .filter((sessionOccurence: SessionOccurrence) => sessionOccurence.session.platform === 'meet');
+      setLiveClasses(liveSessions);
 
       MixpanelTracking.getInstance().identify(userId!);
     } catch (error) {
       console.error("Error fetching user sessions:", error);
     }
   };
 
+
   const renderLiveClasses = () => {
     if (liveClasses.length === 0) {
       return <MessageDisplay message="No more live classes are scheduled for today!" />;
@@ -147,6 +145,21 @@ export default function Home() {
   };
 
   const renderTestSection = (title: string, tests: QuizSession[]) => {
+    const shouldShow = (() => {
+      switch (title.toLowerCase()) {
+        case 'tests':
+          return groupConfig.showTests;
+        case 'practice tests':
+          return groupConfig.showPracticeTests;
+        case 'homework':
+          return groupConfig.showHomework;
+        default:
+          return true;
+      }
+    })();
+
+    if (!shouldShow) return null;
+
     if (tests.length === 0) {
       return (
         <div>
@@ -280,17 +293,17 @@ export default function Home() {
       ) : (
         <main className="min-h-screen max-w-xl mx-auto md:mx-auto bg-heading">
           <TopBar />
-          {group !== 'AllIndiaStudents' && (
+          {groupConfig.showLiveClasses && (
             <div>
               <h1 className="text-primary ml-4 font-semibold text-xl pt-6">Live Classes</h1>
               {renderLiveClasses()}
             </div>
           )}
 
           <div className="pb-40">
-            {renderTestSection("Tests", [...nonChapterTests, ...chapterTests])}
-            {renderTestSection("Practice Tests", practiceTests)}
-            {renderTestSection("Homework", homework)}
+            {groupConfig.showTests && renderTestSection("Tests", [...nonChapterTests, ...chapterTests])}
+            {groupConfig.showPracticeTests && renderTestSection("Practice Tests", practiceTests)}
+            {groupConfig.showHomework && renderTestSection("Homework", homework)}
           </div>
           <BottomNavigationBar />
         </main>

diff --git a/app/types.ts b/app/types.ts
@@ -155,4 +155,17 @@ export interface MessageDisplayProps {
 
 export interface QuizCompletionStatus {
   [key: string]: boolean;
-}
+}
+
+export interface GroupConfig {
+  showLiveClasses: boolean;
+  showTests: boolean;
+  showPracticeTests: boolean;
+  showHomework: boolean;
+  showContentLibrary: boolean;
+  showClassLibrary: boolean;
+}
+
+export type GroupConfigurations = {
+  [key: string]: GroupConfig;
+};
diff --git a/config/groupConfig.ts b/config/groupConfig.ts
@@ -0,0 +1,42 @@
+import { GroupConfig, GroupConfigurations } from "@/app/types";
+
+const groupConfig: GroupConfigurations = {
+    AllIndiaStudents: {
+        showLiveClasses: false,
+        showTests: true,
+        showPracticeTests: true,
+        showHomework: false,
+        showContentLibrary: true,
+        showClassLibrary: false,
+    },
+    EnableStudents: {
+        showLiveClasses: true,
+        showTests: true,
+        showPracticeTests: true,
+        showHomework: true,
+        showContentLibrary: true,
+        showClassLibrary: false,
+    },
+    DelhiStudents: {
+        showLiveClasses: true,
+        showTests: true,
+        showPracticeTests: true,
+        showHomework: true,
+        showContentLibrary: true,
+        showClassLibrary: true,
+    },
+    defaultGroup: {
+        showLiveClasses: true,
+        showTests: true,
+        showPracticeTests: true,
+        showHomework: true,
+        showContentLibrary: true,
+        showClassLibrary: true,
+    }
+};
+
+export const getGroupConfig = (group: string): GroupConfig => {
+    return groupConfig[group] || groupConfig.defaultGroup;
+};
+
+export default groupConfig;