@quesmed/types 2.4.6 → 2.4.8

package/dist/cjs/models/User.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.currentClassGroup = exports.currentClassYear = exports.EPracticeIntensity = exports.classYearGroup = exports.EClassYearGroup = exports.classYears = void 0;
+const luxon_1 = require("luxon");
 exports.classYears = [
     'Year 1',
     'Year 2',
@@ -33,7 +34,7 @@ var EPracticeIntensity;
     EPracticeIntensity[EPracticeIntensity["MED"] = 2] = "MED";
     EPracticeIntensity[EPracticeIntensity["HIGH"] = 3] = "HIGH";
 })(EPracticeIntensity = exports.EPracticeIntensity || (exports.EPracticeIntensity = {}));
-function currentClassYear(createdAtUnix, classYear, compareUnix = new Date().getTime()) {
+function currentClassYear(createdAtUnix, classYear, compareUnix = luxon_1.DateTime.now().toUnixInteger()) {
     if (createdAtUnix === 0) {
         throw new Error('createdAt not given in Unix');
     }
@@ -45,20 +46,18 @@ function currentClassYear(createdAtUnix, classYear, compareUnix = new Date().get
     if (classYearsIdx === -1) {
         return exports.classYears[lastClassYearIdx];
     }
-    const compareDate = new Date(compareUnix * 1000);
-    const currentYear = compareDate.getFullYear();
-    const createdAt = new Date(createdAtUnix * 1000);
-    if (createdAt.getFullYear() > compareDate.getFullYear()) {
+    const compareDT = luxon_1.DateTime.fromSeconds(compareUnix);
+    const createdAtDT = luxon_1.DateTime.fromSeconds(createdAtUnix);
+    if (createdAtDT.year > compareDT.year) {
         throw new Error('createdAt not given in Unix');
     }
-    const createdYear = createdAt.getFullYear();
-    let yearsAdded = currentYear - createdYear;
-    const createdAcademicYear = new Date(createdYear, 7, 1);
-    const nowAcademicYear = new Date(currentYear, 7, 1);
-    if (createdAt > createdAcademicYear) {
-        yearsAdded--;
+    let yearsAdded = compareDT.year - createdAtDT.year;
+    let createdAtAcademicDT = luxon_1.DateTime.local(createdAtDT.year, 8, 1);
+    if (createdAtDT < createdAtAcademicDT) {
+        createdAtAcademicDT = createdAtAcademicDT.minus({ year: 1 });
     }
-    if (compareDate > nowAcademicYear) {
+    const compareAcademicDT = luxon_1.DateTime.local(compareDT.year, 8, 1);
+    if (compareDT > compareAcademicDT) {
         yearsAdded++;
     }
     const newClassYearIdx = classYearsIdx + yearsAdded;

package/dist/cjs/resolvers/mutation/restricted/todo.d.ts

@@ -31,14 +31,20 @@ export declare const ADD_TO_DAILY_STACK: import("@apollo/client").DocumentNode;
 export interface IAddToDailyStackVar {
     conceptIds: Id[];
 }
-export declare type IAddToDailyStackData = RestrictedData<(graphqlNormalize & IUserCompletedCard)[], 'addToDailyStack'>;
+export declare type IAddToDailyStackData = RestrictedData<graphqlNormalize & {
+    addedUserCompletedCards: (graphqlNormalize & IUserCompletedCard)[];
+    dailyFeed: graphqlNormalize & ITodo;
+}, 'addToDailyStack'>;
 export declare const REMOVE_FROM_DAILY_STACK: import("@apollo/client").DocumentNode;
 export interface IRemoveFromDailyStackVar {
     cardId?: Id;
     todoId?: Id;
     conceptId?: Id;
 }
-export declare type IRemoveFromDailyStackData = RestrictedData<(graphqlNormalize & IUserCompletedCard)[], 'removeFromDailyStack'>;
+export declare type IRemoveFromDailyStackData = RestrictedData<graphqlNormalize & {
+    removedUserCompletedCards: (graphqlNormalize & IUserCompletedCard)[];
+    dailyFeed: graphqlNormalize & ITodo;
+}, 'removeFromDailyStack'>;
 export declare const updateCacheOnRemoveFromDailyStack: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<IRemoveFromDailyStackData>, options: ApolloUpdateOptions) => void;
 export declare const updateCacheOnAddToDailyStack: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<IAddToDailyStackData>) => void;
 export declare const REFRESH_DAILY_TASK: import("@apollo/client").DocumentNode;

package/dist/cjs/resolvers/mutation/restricted/todo.js

@@ -118,34 +118,42 @@ exports.ADD_TO_DAILY_STACK = (0, client_1.gql) `
   mutation AddToDailyStack($conceptIds: [Int!]!) {
     restricted {
       addToDailyStack(conceptIds: $conceptIds) {
-        id
-        createdAt
-        updatedAt
-        concept {
-          id
-          name
-        }
-        lastSeen
-        reviewDate
-        score
-        iteration
-        optimalFactor
-        cardId
-        card {
+        addedUserCompletedCards {
           id
-          conceptId
+          createdAt
+          updatedAt
           concept {
             id
             name
           }
-          topic {
+          lastSeen
+          reviewDate
+          score
+          iteration
+          optimalFactor
+          cardId
+          card {
             id
-            name
+            conceptId
+            concept {
+              id
+              name
+            }
+            topic {
+              id
+              name
+            }
+            question
+            explanation
+            pictures {
+              ...PictureFields
+            }
           }
-          question
-          explanation
-          pictures {
-            ...PictureFields
+        }
+        dailyFeed {
+          id
+          marks {
+            id
           }
         }
       }
@@ -160,24 +168,32 @@ exports.REMOVE_FROM_DAILY_STACK = (0, client_1.gql) `
         todoId: $todoId
         conceptId: $conceptId
       ) {
-        id
-        cardId
-        concept {
+        removedUserCompletedCards {
           id
-          name
+          cardId
+          concept {
+            id
+            name
+          }
+        }
+        dailyFeed {
+          id
+          marks {
+            id
+          }
         }
       }
     }
   }
 `;
 const updateCacheOnRemoveFromDailyStack = (cache, result, options) => {
-    const { removeFromDailyStack } = result.data?.restricted || {};
+    const { removeFromDailyStack: data } = result.data?.restricted || {};
     const { variables } = options || {};
     const { todoId } = variables || {};
-    if (!removeFromDailyStack || !removeFromDailyStack.length) {
+    if (!data || !data.removedUserCompletedCards.length) {
         return;
     }
-    const toRemove = new Set(removeFromDailyStack.map(({ cardId }) => cardId));
+    const toRemove = new Set(data.removedUserCompletedCards.map(({ cardId }) => cardId));
     const prevData = cache.readQuery({
         query: restricted_1.USER_COMPLETED_DATA,
     });
@@ -223,14 +239,14 @@ const updateCacheOnRemoveFromDailyStack = (cache, result, options) => {
 };
 exports.updateCacheOnRemoveFromDailyStack = updateCacheOnRemoveFromDailyStack;
 const updateCacheOnAddToDailyStack = (cache, result) => {
-    const { addToDailyStack } = result.data?.restricted || {};
+    const { addToDailyStack: data } = result.data?.restricted || {};
     const prevData = cache.readQuery({
         query: restricted_1.USER_COMPLETED_DATA,
     });
-    if (prevData && addToDailyStack) {
+    if (prevData && data) {
         const newCompletedCards = [
             ...prevData.restricted.user.completedCards,
-            ...addToDailyStack,
+            ...data.addedUserCompletedCards,
         ];
         cache.writeQuery({
             query: restricted_1.USER_COMPLETED_DATA,

package/dist/mjs/models/User.js

@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon';
 export const classYears = [
     'Year 1',
     'Year 2',
@@ -30,7 +31,7 @@ export var EPracticeIntensity;
     EPracticeIntensity[EPracticeIntensity["MED"] = 2] = "MED";
     EPracticeIntensity[EPracticeIntensity["HIGH"] = 3] = "HIGH";
 })(EPracticeIntensity || (EPracticeIntensity = {}));
-export function currentClassYear(createdAtUnix, classYear, compareUnix = new Date().getTime()) {
+export function currentClassYear(createdAtUnix, classYear, compareUnix = DateTime.now().toUnixInteger()) {
     if (createdAtUnix === 0) {
         throw new Error('createdAt not given in Unix');
     }
@@ -42,20 +43,18 @@ export function currentClassYear(createdAtUnix, classYear, compareUnix = new Dat
     if (classYearsIdx === -1) {
         return classYears[lastClassYearIdx];
     }
-    const compareDate = new Date(compareUnix * 1000);
-    const currentYear = compareDate.getFullYear();
-    const createdAt = new Date(createdAtUnix * 1000);
-    if (createdAt.getFullYear() > compareDate.getFullYear()) {
+    const compareDT = DateTime.fromSeconds(compareUnix);
+    const createdAtDT = DateTime.fromSeconds(createdAtUnix);
+    if (createdAtDT.year > compareDT.year) {
         throw new Error('createdAt not given in Unix');
     }
-    const createdYear = createdAt.getFullYear();
-    let yearsAdded = currentYear - createdYear;
-    const createdAcademicYear = new Date(createdYear, 7, 1);
-    const nowAcademicYear = new Date(currentYear, 7, 1);
-    if (createdAt > createdAcademicYear) {
-        yearsAdded--;
+    let yearsAdded = compareDT.year - createdAtDT.year;
+    let createdAtAcademicDT = DateTime.local(createdAtDT.year, 8, 1);
+    if (createdAtDT < createdAtAcademicDT) {
+        createdAtAcademicDT = createdAtAcademicDT.minus({ year: 1 });
     }
-    if (compareDate > nowAcademicYear) {
+    const compareAcademicDT = DateTime.local(compareDT.year, 8, 1);
+    if (compareDT > compareAcademicDT) {
         yearsAdded++;
     }
     const newClassYearIdx = classYearsIdx + yearsAdded;

package/dist/mjs/resolvers/mutation/restricted/todo.d.ts

@@ -31,14 +31,20 @@ export declare const ADD_TO_DAILY_STACK: import("@apollo/client").DocumentNode;
 export interface IAddToDailyStackVar {
     conceptIds: Id[];
 }
-export declare type IAddToDailyStackData = RestrictedData<(graphqlNormalize & IUserCompletedCard)[], 'addToDailyStack'>;
+export declare type IAddToDailyStackData = RestrictedData<graphqlNormalize & {
+    addedUserCompletedCards: (graphqlNormalize & IUserCompletedCard)[];
+    dailyFeed: graphqlNormalize & ITodo;
+}, 'addToDailyStack'>;
 export declare const REMOVE_FROM_DAILY_STACK: import("@apollo/client").DocumentNode;
 export interface IRemoveFromDailyStackVar {
     cardId?: Id;
     todoId?: Id;
     conceptId?: Id;
 }
-export declare type IRemoveFromDailyStackData = RestrictedData<(graphqlNormalize & IUserCompletedCard)[], 'removeFromDailyStack'>;
+export declare type IRemoveFromDailyStackData = RestrictedData<graphqlNormalize & {
+    removedUserCompletedCards: (graphqlNormalize & IUserCompletedCard)[];
+    dailyFeed: graphqlNormalize & ITodo;
+}, 'removeFromDailyStack'>;
 export declare const updateCacheOnRemoveFromDailyStack: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<IRemoveFromDailyStackData>, options: ApolloUpdateOptions) => void;
 export declare const updateCacheOnAddToDailyStack: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<IAddToDailyStackData>) => void;
 export declare const REFRESH_DAILY_TASK: import("@apollo/client").DocumentNode;

package/dist/mjs/resolvers/mutation/restricted/todo.js

@@ -112,34 +112,42 @@ export const ADD_TO_DAILY_STACK = gql `
   mutation AddToDailyStack($conceptIds: [Int!]!) {
     restricted {
       addToDailyStack(conceptIds: $conceptIds) {
-        id
-        createdAt
-        updatedAt
-        concept {
-          id
-          name
-        }
-        lastSeen
-        reviewDate
-        score
-        iteration
-        optimalFactor
-        cardId
-        card {
+        addedUserCompletedCards {
           id
-          conceptId
+          createdAt
+          updatedAt
           concept {
             id
             name
           }
-          topic {
+          lastSeen
+          reviewDate
+          score
+          iteration
+          optimalFactor
+          cardId
+          card {
             id
-            name
+            conceptId
+            concept {
+              id
+              name
+            }
+            topic {
+              id
+              name
+            }
+            question
+            explanation
+            pictures {
+              ...PictureFields
+            }
           }
-          question
-          explanation
-          pictures {
-            ...PictureFields
+        }
+        dailyFeed {
+          id
+          marks {
+            id
           }
         }
       }
@@ -154,24 +162,32 @@ export const REMOVE_FROM_DAILY_STACK = gql `
         todoId: $todoId
         conceptId: $conceptId
       ) {
-        id
-        cardId
-        concept {
+        removedUserCompletedCards {
           id
-          name
+          cardId
+          concept {
+            id
+            name
+          }
+        }
+        dailyFeed {
+          id
+          marks {
+            id
+          }
         }
       }
     }
   }
 `;
 export const updateCacheOnRemoveFromDailyStack = (cache, result, options) => {
-    const { removeFromDailyStack } = result.data?.restricted || {};
+    const { removeFromDailyStack: data } = result.data?.restricted || {};
     const { variables } = options || {};
     const { todoId } = variables || {};
-    if (!removeFromDailyStack || !removeFromDailyStack.length) {
+    if (!data || !data.removedUserCompletedCards.length) {
         return;
     }
-    const toRemove = new Set(removeFromDailyStack.map(({ cardId }) => cardId));
+    const toRemove = new Set(data.removedUserCompletedCards.map(({ cardId }) => cardId));
     const prevData = cache.readQuery({
         query: USER_COMPLETED_DATA,
     });
@@ -216,14 +232,14 @@ export const updateCacheOnRemoveFromDailyStack = (cache, result, options) => {
     }
 };
 export const updateCacheOnAddToDailyStack = (cache, result) => {
-    const { addToDailyStack } = result.data?.restricted || {};
+    const { addToDailyStack: data } = result.data?.restricted || {};
     const prevData = cache.readQuery({
         query: USER_COMPLETED_DATA,
     });
-    if (prevData && addToDailyStack) {
+    if (prevData && data) {
         const newCompletedCards = [
             ...prevData.restricted.user.completedCards,
-            ...addToDailyStack,
+            ...data.addedUserCompletedCards,
         ];
         cache.writeQuery({
             query: USER_COMPLETED_DATA,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types",
-  "version": "2.4.6",
+  "version": "2.4.8",
   "description": "Typescript types for Quesmed",
   "keywords": [
     "quesmed",
@@ -75,7 +75,7 @@
   "author": "stefan@quesmed.com",
   "license": "ISC",
   "scripts": {
-    "test": "jest",
+    "test": "yarn jest",
     "clean": "rimraf dist && rimraf build",
     "tsc:watch:mjs": "yarn pnpify tsc -w -p tsconfig.json",
     "tsc:watch:cjs": "yarn pnpify tsc -w -p tsconfig-cjs.json",