@speakableio/core 0.1.18 → 0.1.20

package/dist/index.js

@@ -1371,6 +1371,7 @@ var getScore = withErrorHandler(_getScore, "getScore");
 
 // src/domains/assignment/utils/calculateScoreAndProgress.ts
 var calculateScoreAndProgress = (scores, cardsList, weights) => {
+  console.log("calculateScoreAndProgress", scores, cardsList, weights);
   const totalSetPoints = cardsList.reduce((acc, cardId) => {
     acc += _optionalChain([weights, 'optionalAccess', _32 => _32[cardId]]) || 1;
     return acc;
@@ -1481,7 +1482,7 @@ async function clearScore(params) {
 
 // src/domains/assignment/services/submit-assignment-score.service.ts
 
-async function submitAssignmentScore({
+async function _submitAssignmentScore({
   cardIds,
   assignment,
   setWeights,
@@ -1513,6 +1514,10 @@ async function submitAssignmentScore({
   await api.updateDoc(path, { ...fieldsUpdated });
   return { success: true, fieldsUpdated };
 }
+var submitAssignmentScore = withErrorHandler(
+  _submitAssignmentScore,
+  "submitAssignmentScore"
+);
 async function handleAssessment(assignment, userId, cardIds, setWeights, fieldsUpdated, studentName) {
   const path = refsAssignmentFiresotre.assignmentScores({ id: assignment.id, userId });
   const response = await api.getDoc(path);
@@ -1532,7 +1537,7 @@ async function handleAssessment(assignment, userId, cardIds, setWeights, fieldsU
   return { success: true, fieldsUpdated };
 }
 async function handleCourseAssignment(assignment, userId) {
-  const { data } = await _optionalChain([SpeakableFirebaseFunctions, 'optionalAccess', _51 => _51.submitAssignmentV2, 'optionalCall', _52 => _52({
+  await _optionalChain([SpeakableFirebaseFunctions, 'optionalAccess', _51 => _51.submitAssignmentV2, 'optionalCall', _52 => _52({
     assignmentId: assignment.id,
     userId
   })]);
@@ -1613,25 +1618,24 @@ function useUpdateScore() {
 function useUpdateCardScore({
   isAssignment,
   activityId,
-  userId
+  userId,
+  set
 }) {
   const { queryClient } = useSpeakableApi();
-  const querySet = useSet({ setId: activityId });
-  const dataCurrentSet = querySet.data;
   const queryKey = scoreQueryKeys.byId(activityId);
   const mutation = _reactquery.useMutation.call(void 0, {
     mutationFn: async ({ cardId, cardScore }) => {
       const previousScores = queryClient.getQueryData(queryKey);
-      console.log({
-        previousScores,
+      console.log("useUpdateCardScore", {
+        previousScores: _nullishCoalesce(previousScores, () => ( {})),
         cardId,
         cardScore,
-        dataCurrentSet
+        activityId
       });
       const { progress, score, newScoreUpdated, updatedCardScore } = getScoreUpdated({
         previousScores: _nullishCoalesce(previousScores, () => ( {})),
         cardId,
-        set: _nullishCoalesce(dataCurrentSet, () => ( void 0)),
+        set,
         cardScore
       });
       await updateCardScore({
@@ -1653,7 +1657,7 @@ function useUpdateCardScore({
           score: previousScore,
           cardId,
           cardScore,
-          set: _nullishCoalesce(dataCurrentSet, () => ( void 0))
+          set
         });
         return {
           ...previousScore,
@@ -1900,7 +1904,8 @@ function useActivity({
   const { mutationUpdateCardScore } = useUpdateCardScore({
     activityId,
     isAssignment,
-    userId
+    userId,
+    set: _nullishCoalesce(querySet.data, () => ( void 0))
   });
   const { mutationClearScore } = useClearScore();
   const { submitAssignmentScore: submitAssignmentScore2 } = useSubmitAssignmentScore({

package/dist/index.mjs

@@ -1371,6 +1371,7 @@ var getScore = withErrorHandler(_getScore, "getScore");
 
 // src/domains/assignment/utils/calculateScoreAndProgress.ts
 var calculateScoreAndProgress = (scores, cardsList, weights) => {
+  console.log("calculateScoreAndProgress", scores, cardsList, weights);
   const totalSetPoints = cardsList.reduce((acc, cardId) => {
     acc += weights?.[cardId] || 1;
     return acc;
@@ -1481,7 +1482,7 @@ async function clearScore(params) {
 
 // src/domains/assignment/services/submit-assignment-score.service.ts
 import dayjs4 from "dayjs";
-async function submitAssignmentScore({
+async function _submitAssignmentScore({
   cardIds,
   assignment,
   setWeights,
@@ -1513,6 +1514,10 @@ async function submitAssignmentScore({
   await api.updateDoc(path, { ...fieldsUpdated });
   return { success: true, fieldsUpdated };
 }
+var submitAssignmentScore = withErrorHandler(
+  _submitAssignmentScore,
+  "submitAssignmentScore"
+);
 async function handleAssessment(assignment, userId, cardIds, setWeights, fieldsUpdated, studentName) {
   const path = refsAssignmentFiresotre.assignmentScores({ id: assignment.id, userId });
   const response = await api.getDoc(path);
@@ -1532,7 +1537,7 @@ async function handleAssessment(assignment, userId, cardIds, setWeights, fieldsU
   return { success: true, fieldsUpdated };
 }
 async function handleCourseAssignment(assignment, userId) {
-  const { data } = await SpeakableFirebaseFunctions?.submitAssignmentV2?.({
+  await SpeakableFirebaseFunctions?.submitAssignmentV2?.({
     assignmentId: assignment.id,
     userId
   });
@@ -1613,25 +1618,24 @@ function useUpdateScore() {
 function useUpdateCardScore({
   isAssignment,
   activityId,
-  userId
+  userId,
+  set
 }) {
   const { queryClient } = useSpeakableApi();
-  const querySet = useSet({ setId: activityId });
-  const dataCurrentSet = querySet.data;
   const queryKey = scoreQueryKeys.byId(activityId);
   const mutation = useMutation2({
     mutationFn: async ({ cardId, cardScore }) => {
       const previousScores = queryClient.getQueryData(queryKey);
-      console.log({
-        previousScores,
+      console.log("useUpdateCardScore", {
+        previousScores: previousScores ?? {},
         cardId,
         cardScore,
-        dataCurrentSet
+        activityId
       });
       const { progress, score, newScoreUpdated, updatedCardScore } = getScoreUpdated({
         previousScores: previousScores ?? {},
         cardId,
-        set: dataCurrentSet ?? void 0,
+        set,
         cardScore
       });
       await updateCardScore({
@@ -1653,7 +1657,7 @@ function useUpdateCardScore({
           score: previousScore,
           cardId,
           cardScore,
-          set: dataCurrentSet ?? void 0
+          set
         });
         return {
           ...previousScore,
@@ -1900,7 +1904,8 @@ function useActivity({
   const { mutationUpdateCardScore } = useUpdateCardScore({
     activityId,
     isAssignment,
-    userId
+    userId,
+    set: querySet.data ?? void 0
   });
   const { mutationClearScore } = useClearScore();
   const { submitAssignmentScore: submitAssignmentScore2 } = useSubmitAssignmentScore({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speakableio/core",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Speakable-io/speakable-core.git"