@shaxpir/duiduidui-models 1.7.0 → 1.7.3

package/dist/models/Metric.d.ts

@@ -34,7 +34,7 @@ export declare class Metric extends Content {
     get maxDate(): CompactDate;
     get length(): number;
     get(index: number): MetricEntry;
-    sumBetween(minDate: CompactDate, maxDate: CompactDate): number;
+    sumBetween(minDate?: CompactDate | null, maxDate?: CompactDate | null): number;
     forDate(date: CompactDate): number;
     nonZeroDayCount(): number;
     setDateAmount(date: CompactDate, amount: number): void;

package/dist/models/Metric.js

@@ -97,8 +97,16 @@ class Metric extends Content_1.Content {
     }
     sumBetween(minDate, maxDate) {
         this.checkDisposed("Metric.sumBetween");
+        // Use payload min/max dates as defaults for null parameters
+        const effectiveMinDate = minDate || this.payload.min_date;
+        const effectiveMaxDate = maxDate || this.payload.max_date;
+        // If we still don't have dates (empty metric), return 0
+        if (!effectiveMinDate || !effectiveMaxDate) {
+            return 0;
+        }
+        // Sum between the effective dates
         let sum = 0;
-        const dates = shaxpir_common_1.Time.datesBetween(minDate, maxDate);
+        const dates = shaxpir_common_1.Time.datesBetween(effectiveMinDate, effectiveMaxDate);
         for (let i = 0, len = dates.length; i < len; i++) {
             const date = dates[i];
             sum += this.forDate(date);

package/dist/models/Progress.d.ts

@@ -30,6 +30,7 @@ export interface ProgressPayload {
     skill_level: UncertainValue;
     cognitive_load: number;
     streaks?: StreakData;
+    total_review_count: number;
 }
 export interface ProgressBody extends ContentBody {
     meta: ContentMeta;
@@ -55,4 +56,6 @@ export declare class Progress extends Content {
     setCognitiveLoad(value: number): void;
     getStreaks(): StreakData | undefined;
     setStreaks(streaks: StreakData): void;
+    getTotalReviewCount(): number;
+    setTotalReviewCount(count: number): void;
 }

package/dist/models/Progress.js

@@ -31,7 +31,8 @@ class Progress extends Content_1.Content {
                         upper: 1000 // Could potentially be advanced
                     }
                 },
-                cognitive_load: 0
+                cognitive_load: 0,
+                total_review_count: 0 // Start with zero lifetime reviews
             }
         });
     }
@@ -134,5 +135,17 @@ class Progress extends Content_1.Content {
             batch.commit();
         }
     }
+    getTotalReviewCount() {
+        this.checkDisposed("Progress.getTotalReviewCount");
+        return this.payload.total_review_count;
+    }
+    setTotalReviewCount(count) {
+        this.checkDisposed("Progress.setTotalReviewCount");
+        if (this.payload.total_review_count !== count) {
+            const batch = new Operation_1.BatchOperation(this);
+            batch.setPathValue(['payload', 'total_review_count'], count);
+            batch.commit();
+        }
+    }
 }
 exports.Progress = Progress;

package/dist/models/Session.d.ts

@@ -6,7 +6,6 @@ import { Content, ContentBody, ContentId, ContentMeta, ContentRef } from "./Cont
 import { Review } from './Review';
 import { UncertainValue } from './Progress';
 export interface SessionConfig {
-    version: number;
     constraints?: {
         card_limit?: number | null;
         time_limit?: number;
@@ -16,7 +15,6 @@ export interface SessionConfig {
         filters?: ConditionFilters;
         strategy?: {
             name: string;
-            version?: string;
             constants?: Record<string, any>;
         };
     };
@@ -25,7 +23,7 @@ export interface SessionConfig {
         auto_play_speech?: boolean;
     };
 }
-export interface SessionMetrics {
+export interface SessionStats {
     skill_level: UncertainValue;
     cognitive_load: number;
     theta_distribution: {
@@ -57,12 +55,13 @@ export interface SessionPayload {
     duration_minutes: number;
     reviews: Review[];
     review_count: number;
+    is_complete: boolean;
+    app_version?: string;
     config?: SessionConfig;
-    metrics?: {
-        before?: SessionMetrics;
-        after?: SessionMetrics;
+    stats?: {
+        before?: SessionStats;
+        after?: SessionStats;
     };
-    is_complete?: boolean;
 }
 export interface SessionBody extends ContentBody {
     meta: ContentMeta;
@@ -73,7 +72,7 @@ export declare class Session extends Content {
     constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     static makeSessionId(userId: ContentId): ContentId;
     static makeSessionRef(userId: ContentId, at: MultiTime): ContentRef;
-    static create(userId: ContentId, deviceId: ContentId): Session;
+    static create(userId: ContentId, deviceId: ContentId, appVersion: string): Session;
     get payload(): SessionPayload;
     touch(): void;
     get start(): MultiTime;
@@ -88,10 +87,12 @@ export declare class Session extends Content {
     setConfig(config: SessionConfig): void;
     get isComplete(): boolean;
     markComplete(): void;
-    get metricsBefore(): SessionMetrics | undefined;
-    setMetricsBefore(metrics: SessionMetrics): void;
-    get metricsAfter(): SessionMetrics | undefined;
-    setMetricsAfter(metrics: SessionMetrics): void;
+    get statsBefore(): SessionStats | undefined;
+    setStatsBefore(stats: SessionStats): void;
+    get statsAfter(): SessionStats | undefined;
+    setStatsAfter(stats: SessionStats): void;
     isActive(): boolean;
+    get appVersion(): string | undefined;
+    setAppVersion(version: string): void;
     modelUpdated(): Promise<void>;
 }

package/dist/models/Session.js

@@ -8,6 +8,7 @@ const Content_1 = require("./Content");
 const ContentKind_1 = require("./ContentKind");
 const Metric_1 = require("./Metric");
 const Operation_1 = require("./Operation");
+const Progress_1 = require("./Progress");
 const Workspace_1 = require("./Workspace");
 class Session extends Content_1.Content {
     constructor(doc, shouldAcquire, shareSync) {
@@ -21,7 +22,7 @@ class Session extends Content_1.Content {
         let sessionId = Session.makeSessionId(userId);
         return `${sessionId}_${at.utc_time}`;
     }
-    static create(userId, deviceId) {
+    static create(userId, deviceId, appVersion) {
         let now = shaxpir_common_1.ClockService.getClock().now();
         let sessionId = Session.makeSessionId(userId);
         let sessionRef = Session.makeSessionRef(userId, now);
@@ -37,11 +38,13 @@ class Session extends Content_1.Content {
             payload: {
                 start: now,
                 end: now,
+                is_complete: false,
                 tz_offset: (new Date()).getTimezoneOffset(),
                 duration_minutes: 0,
                 device_id: deviceId,
                 reviews: [],
-                review_count: 0
+                review_count: 0,
+                app_version: appVersion
             }
         });
     }
@@ -126,30 +129,30 @@ class Session extends Content_1.Content {
         batch.setPathValue(['payload', 'is_complete'], true);
         batch.commit();
     }
-    get metricsBefore() {
-        this.checkDisposed("Session.metricsBefore");
-        return this.payload.metrics?.before;
+    get statsBefore() {
+        this.checkDisposed("Session.statsBefore");
+        return this.payload.stats?.before;
     }
-    setMetricsBefore(metrics) {
-        this.checkDisposed("Session.setMetricsBefore");
+    setStatsBefore(stats) {
+        this.checkDisposed("Session.setStatsBefore");
         const batch = new Operation_1.BatchOperation(this);
-        if (!this.payload.metrics) {
-            batch.setPathValue(['payload', 'metrics'], {});
+        if (!this.payload.stats) {
+            batch.setPathValue(['payload', 'stats'], {});
         }
-        batch.setPathValue(['payload', 'metrics', 'before'], metrics);
+        batch.setPathValue(['payload', 'stats', 'before'], stats);
         batch.commit();
     }
-    get metricsAfter() {
-        this.checkDisposed("Session.metricsAfter");
-        return this.payload.metrics?.after;
+    get statsAfter() {
+        this.checkDisposed("Session.statsAfter");
+        return this.payload.stats?.after;
     }
-    setMetricsAfter(metrics) {
-        this.checkDisposed("Session.setMetricsAfter");
+    setStatsAfter(stats) {
+        this.checkDisposed("Session.setStatsAfter");
         const batch = new Operation_1.BatchOperation(this);
-        if (!this.payload.metrics) {
-            batch.setPathValue(['payload', 'metrics'], {});
+        if (!this.payload.stats) {
+            batch.setPathValue(['payload', 'stats'], {});
         }
-        batch.setPathValue(['payload', 'metrics', 'after'], metrics);
+        batch.setPathValue(['payload', 'stats', 'after'], stats);
         batch.commit();
     }
     isActive() {
@@ -162,6 +165,16 @@ class Session extends Content_1.Content {
         const fifteenMinutesAgo = shaxpir_common_1.Time.plus(now.utc_time, -15, 'minutes');
         return shaxpir_common_1.Time.isDateTimeAfter(this.updatedAt.utc_time, fifteenMinutesAgo);
     }
+    get appVersion() {
+        this.checkDisposed("Session.appVersion");
+        return this.payload.app_version;
+    }
+    setAppVersion(version) {
+        this.checkDisposed("Session.setAppVersion");
+        const batch = new Operation_1.BatchOperation(this);
+        batch.setPathValue(['payload', 'app_version'], version);
+        batch.commit();
+    }
     async modelUpdated() {
         this.checkDisposed("Session.modelUpdated");
         await super.modelUpdated();
@@ -189,7 +202,14 @@ class Session extends Content_1.Content {
         const reviewCountMetricId = Metric_1.Metric.makeMetricId(userId, Metric_1.MetricName.REVIEW_COUNT);
         const reviewCountMetric = await shareSync.acquire(ContentKind_1.ContentKind.METRIC, reviewCountMetricId);
         reviewCountMetric.setDateAmount(date, reviewCountOnDate);
+        // Calculate total review count using sumBetween with null arguments (sums all entries)
+        const totalReviewCount = reviewCountMetric.sumBetween(null, null);
         reviewCountMetric.release();
+        // Update total review count in Progress
+        const progressId = Progress_1.Progress.makeProgressId(userId);
+        const progress = await shareSync.acquire(ContentKind_1.ContentKind.PROGRESS, progressId);
+        progress.setTotalReviewCount(totalReviewCount);
+        progress.release();
     }
 }
 exports.Session = Session;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaxpir/duiduidui-models",
-  "version": "1.7.0",
+  "version": "1.7.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/shaxpir/duiduidui-models"