Sunbird-ALL · gouravmore · Jan 2, 2025 · Dec 17, 2024 · Dec 17, 2024 · Dec 17, 2024
diff --git a/.github/workflows/all-dev-tn-new.yml b/.github/workflows/all-dev-tn-new.yml
@@ -3,7 +3,7 @@ name: ALL new tn dev Deployment
 on:
   push:
     branches:
-      - all-1.3-tn-dev-hotfix
+      - all-1.3-feedback-change
 
 jobs:
   deploy:

diff --git a/.github/workflows/all-dev-tn.yml b/.github/workflows/all-dev-tn.yml
@@ -3,7 +3,7 @@ name: ALL tn dev Deployment
 on:
   push:
     branches:
-      - all-1.2-tn-dev
+      - release-1.3-apicall-optimisation
 
 jobs:
   deploy:

diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,7 @@ lerna-debug.log*
 .env
 #build
 build
-
+*.env*
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 

diff --git a/src/App.js b/src/App.js
@@ -6,7 +6,7 @@ import FingerprintJS from "@fingerprintjs/fingerprintjs";
 import routes from "./routes";
 import { AppContent } from "./views";
 import theme from "./assets/styles/theme";
-import { initialize } from "./services/telementryService";
+import { initialize, end } from "./services/telementryService";
 import { startEvent } from "./services/callTelemetryIntract";
 import "@project-sunbird/telemetry-sdk/index.js";
 import { getParameter } from "./utils/constants";
@@ -72,6 +72,20 @@ const App = () => {
     setFp();
   }, []);
 
+  useEffect(() => {
+    const handleBeforeUnload = (event) => {
+      window.telemetry && window.telemetry.syncEvents && window.telemetry.syncEvents();
+    };
+
+    // Add the event listener
+    window.addEventListener("beforeunload", handleBeforeUnload);
+
+    // Cleanup the event listener on component unmount
+    return () => {
+      window.removeEventListener("beforeunload", handleBeforeUnload);
+    };
+  }, []);
+
   useEffect(() => {
     let virtualId;
 

diff --git a/src/components/Assesment/Assesment.jsx b/src/components/Assesment/Assesment.jsx
@@ -598,10 +598,12 @@ const Assesment = ({ discoverStart }) => {
         }
 
         localStorage.setItem("lang", lang || "ta");
-        const getPointersDetails = await axios.get(
-          `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.GET_POINTER}/${usernameDetails?.data?.result?.virtualID}/${session_id}?language=${lang}`
-        );
-        setPoints(getPointersDetails?.data?.result?.totalLanguagePoints || 0);
+        if (localStorage.getItem("contentSessionId") !== null) {
+          const getPointersDetails = await axios.get(
+            `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.GET_POINTER}/${usernameDetails?.data?.result?.virtualID}/${session_id}?language=${lang}`
+          );
+          setPoints(getPointersDetails?.data?.result?.totalLanguagePoints || 0);
+        }
 
         dispatch(setVirtualId(usernameDetails?.data?.result?.virtualID));
       })();
@@ -635,7 +637,7 @@ const Assesment = ({ discoverStart }) => {
           localStorage.setItem("sessionId", sessionId);
         }
 
-        if (virtualId) {
+        if (virtualId && localStorage.getItem("contentSessionId") !== null) {
           const getPointersDetails = await axios.get(
             `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.GET_POINTER}/${virtualId}/${sessionId}?language=${lang}`
           );

diff --git a/src/components/AssesmentEnd/AssesmentEnd.jsx b/src/components/AssesmentEnd/AssesmentEnd.jsx
@@ -44,10 +44,13 @@ const AssesmentEnd = () => {
         sessionId = uniqueId();
         localStorage.setItem("sessionId", sessionId)
       }
-      const getPointersDetails = await axios.get(
-        `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.GET_POINTER}/${virtualId}/${sessionId}?language=${lang}`
-      );
-      setPoints(getPointersDetails?.data?.result?.totalLanguagePoints || 0);
+
+      if (localStorage.getItem("contentSessionId") !== null) {
+        const getPointersDetails = await axios.get(
+          `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.GET_POINTER}/${virtualId}/${sessionId}?language=${lang}`
+        );
+        setPoints(getPointersDetails?.data?.result?.totalLanguagePoints || 0);
+      }
     })();
     setTimeout(() => {
       setShake(false);

diff --git a/src/components/DiscoverSentance/DiscoverSentance.jsx b/src/components/DiscoverSentance/DiscoverSentance.jsx
@@ -118,35 +118,18 @@ const SpeakSentenceComponent = () => {
     try {
       const lang = getLocalData("lang");
 
-      if (!(localStorage.getItem("contentSessionId") !== null)) {
-        const pointsRes = await axios.post(
-          `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.ADD_POINTER}`,
-          {
-            userId: localStorage.getItem("virtualId"),
-            sessionId: localStorage.getItem("sessionId"),
-            points: 1,
-            language: lang,
-            milestone: "m0",
-          }
-        );
-        setPoints(pointsRes?.data?.result?.totalLanguagePoints || 0);
-      } else {
-        send(1);
-        // setPoints(localStorage.getItem("currentLessonScoreCount"));
-      }
-
-      await axios.post(
-        `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.ADD_LESSON}`,
-        {
-          userId: localStorage.getItem("virtualId"),
-          sessionId: localStorage.getItem("sessionId"),
-          milestone: `discoveryList/discovery/${currentCollectionId}`,
-          lesson: localStorage.getItem("storyTitle"),
-          progress: ((currentQuestion + 1) * 100) / questions.length,
-          language: lang,
-          milestoneLevel: "m0",
-        }
-      );
+      // await axios.post(
+      //   `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.ADD_LESSON}`,
+      //   {
+      //     userId: localStorage.getItem("virtualId"),
+      //     sessionId: localStorage.getItem("sessionId"),
+      //     milestone: `discoveryList/discovery/${currentCollectionId}`,
+      //     lesson: localStorage.getItem("storyTitle"),
+      //     progress: ((currentQuestion + 1) * 100) / questions.length,
+      //     language: lang,
+      //     milestoneLevel: "m0",
+      //   }
+      // );
 
       if (currentQuestion < questions.length - 1) {
         setCurrentQuestion(currentQuestion + 1);
@@ -164,6 +147,24 @@ const SpeakSentenceComponent = () => {
             language: localStorage.getItem("lang"),
           }
         );
+
+        if (!(localStorage.getItem("contentSessionId") !== null)) {
+          const pointsRes = await axios.post(
+            `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.ADD_POINTER}`,
+            {
+              userId: localStorage.getItem("virtualId"),
+              sessionId: localStorage.getItem("sessionId"),
+              points: 1,
+              language: lang,
+              milestone: "m0",
+            }
+          );
+          setPoints(pointsRes?.data?.result?.totalLanguagePoints || 0);
+        } else {
+          send(5);
+          // setPoints(localStorage.getItem("currentLessonScoreCount"));
+        }
+
         setInitialAssesment(false);
         const { data: getSetData } = getSetResultRes;
         const data = JSON.stringify(getSetData?.data);

diff --git a/src/services/telementryService.js b/src/services/telementryService.js
@@ -3,6 +3,7 @@ import { CsTelemetryModule } from '@project-sunbird/client-services/telemetry';
 import { uniqueId } from './utilService';
 import { jwtDecode } from '../../node_modules/jwt-decode/build/cjs/index';
 
+let startTime; // Variable to store the timestamp when the start event is raised
 let contentSessionId;
 let playSessionId;
 let url;
@@ -65,6 +66,7 @@ export const initialize = async ({ context, config, metadata }) => {
 
 export const start = (duration) => {
     try {
+        startTime = Date.now(); // Record the start time
         CsTelemetryModule.instance.telemetryService.raiseStartTelemetry({
             options: getEventOptions(),
             edata: {
@@ -114,15 +116,22 @@ export const Log = (context, pageid, telemetryMode) => {
 };
 
 export const end = (data) => {
-    CsTelemetryModule.instance.telemetryService.raiseEndTelemetry({
-        edata: {
-            type: 'content',
-            mode: 'play',
-            pageid: url,
-            summary: data?.summary || {},
-            duration: data?.duration || '000',
-        },
-    });
+    try {
+        const endTime = Date.now(); // Record the end time
+        const duration = ((endTime - startTime) / 1000).toFixed(2); // Calculate duration in seconds
+
+        CsTelemetryModule.instance.telemetryService.raiseEndTelemetry({
+            edata: {
+                type: 'content',
+                mode: 'play',
+                pageid: url,
+                summary: data?.summary || {},
+                duration: duration, // Log the calculated duration
+            },
+        });
+    } catch (error) {
+        console.error("Error in end telemetry event:", error);
+    }
 };
 
 export const interact = (telemetryMode) => {

diff --git a/src/views/Practice/Practice.jsx b/src/views/Practice/Practice.jsx
@@ -70,9 +70,32 @@ const Practice = () => {
     }
   }, [startShowCase]);
 
+  const [audioSrc, setAudioSrc] = useState(null);
+
+  useEffect(() => {
+    const preloadAudio = async () => {
+      try {
+        const response = await fetch(LevelCompleteAudio);
+        const audioBlob = await response.blob();
+        const audioUrl = URL.createObjectURL(audioBlob);
+        setAudioSrc(audioUrl);
+      } catch (error) {
+        console.error("Error loading audio:", error);
+      }
+    };
+    preloadAudio();
+  }, []);
+
   const callConfettiAndPlay = () => {
-    let audio = new Audio(LevelCompleteAudio);
-    audio.play();
+    if (audioSrc) {
+      // Play preloaded audio if available
+      const audio = new Audio(audioSrc);
+      audio.play();
+    } else {
+      // Fallback to LevelCompleteAudio if preloaded audio is not available
+      const fallbackAudio = new Audio(LevelCompleteAudio);
+      fallbackAudio.play();
+    }
     callConfetti();
   };
 
@@ -154,24 +177,6 @@ const Practice = () => {
 
     try {
       const lang = getLocalData("lang");
-      if (localStorage.getItem("contentSessionId") !== null) {
-        setPoints(1);
-        if (isShowCase) {
-          send(1);
-        }
-      } else {
-        const pointsRes = await axios.post(
-          `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.ADD_POINTER}`,
-          {
-            userId: localStorage.getItem("virtualId"),
-            sessionId: localStorage.getItem("sessionId"),
-            points: 1,
-            language: lang,
-            milestone: `m${level}`,
-          }
-        );
-        setPoints(pointsRes?.data?.result?.totalLanguagePoints || 0);
-      }
 
       const virtualId = getLocalData("virtualId");
       const sessionId = getLocalData("sessionId");
@@ -194,18 +199,18 @@ const Practice = () => {
 
       let showcasePercentage = ((currentQuestion + 1) * 100) / questions.length;
 
-      await axios.post(
-        `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.ADD_LESSON}`,
-        {
-          userId: virtualId,
-          sessionId: sessionId,
-          milestone: isShowCase ? "showcase" : `practice`,
-          lesson: currentPracticeStep,
-          progress: isShowCase ? showcasePercentage : currentPracticeProgress,
-          language: lang,
-          milestoneLevel: `m${level}`,
-        }
-      );
+      // await axios.post(
+      //   `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.ADD_LESSON}`,
+      //   {
+      //     userId: virtualId,
+      //     sessionId: sessionId,
+      //     milestone: isShowCase ? "showcase" : `practice`,
+      //     lesson: currentPracticeStep,
+      //     progress: isShowCase ? showcasePercentage : currentPracticeProgress,
+      //     language: lang,
+      //     milestoneLevel: `m${level}`,
+      //   }
+      // );
 
       let newPracticeStep =
         currentQuestion === questions.length - 1 || isGameOver
@@ -226,6 +231,27 @@ const Practice = () => {
         let currentPracticeStep =
           practiceProgress[virtualId].currentPracticeStep;
         let isShowCase = currentPracticeStep === 4 || currentPracticeStep === 9; // P4 or P8
+
+        // Set points
+        if (localStorage.getItem("contentSessionId") !== null) {
+          setPoints(1);
+          if (isShowCase) {
+            send(5);
+          }
+        } else {
+          const pointsRes = await axios.post(
+            `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.ADD_POINTER}`,
+            {
+              userId: localStorage.getItem("virtualId"),
+              sessionId: localStorage.getItem("sessionId"),
+              points: 1,
+              language: lang,
+              milestone: `m${level}`,
+            }
+          );
+          setPoints(pointsRes?.data?.result?.totalLanguagePoints || 0);
+        }
+
         if (isShowCase || isGameOver) {
           // assesment
 
@@ -448,12 +474,14 @@ const Practice = () => {
 
       // TODO: Handle Error for lessons - no lesson progress - starting point should be P1
 
-      const getPointersDetails = await axios.get(
-        `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.GET_POINTER}/${virtualId}/${sessionId}?language=${lang}`
-      );
+      if (localStorage.getItem("contentSessionId") !== null) {
+        const getPointersDetails = await axios.get(
+          `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.GET_POINTER}/${virtualId}/${sessionId}?language=${lang}`
+        );
 
-      // TODO: Just Opss icon - we are trying to fetch the score for you
-      setPoints(getPointersDetails?.data?.result?.totalLanguagePoints || 0);
+        // TODO: Just Opss icon - we are trying to fetch the score for you
+        setPoints(getPointersDetails?.data?.result?.totalLanguagePoints || 0);
+      }
 
       let userState = Number.isInteger(
         Number(resLessons.data?.result?.result?.lesson)
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: ALL new tn dev Deployment @@
     on:
       push:
         branches:
-          - all-1.3-tn-dev-hotfix
+          - all-1.3-feedback-change
     jobs:
       deploy:
@@ Expand Down @@