@shaxpir/duiduidui-models 1.4.24 → 1.4.26

package/dist/models/Metric.d.ts

@@ -3,8 +3,8 @@ import { CompactDate } from "@shaxpir/shaxpir-common";
 import { ShareSync } from '../repo';
 import { Content, ContentBody, ContentId, ContentMeta } from "./Content";
 export declare enum MetricName {
-    WORD_COUNT = "word_count",
-    MINUTES_WRITING = "minutes_writing"
+    REVIEW_COUNT = "review_count",
+    MINUTES_STUDYING = "minutes_studying"
 }
 export interface MetricEntry {
     date: CompactDate;

package/dist/models/Metric.js

@@ -14,8 +14,8 @@ const Operation_1 = require("./Operation");
 dayjs_1.default.extend(utc_1.default);
 var MetricName;
 (function (MetricName) {
-    MetricName["WORD_COUNT"] = "word_count";
-    MetricName["MINUTES_WRITING"] = "minutes_writing";
+    MetricName["REVIEW_COUNT"] = "review_count";
+    MetricName["MINUTES_STUDYING"] = "minutes_studying";
 })(MetricName || (exports.MetricName = MetricName = {}));
 class Metric extends Content_1.Content {
     static makeMetricId(userId, metricName) {

package/dist/models/Session.d.ts

@@ -3,6 +3,7 @@ import { MultiTime } from "@shaxpir/shaxpir-common";
 import { ShareSync } from '../repo';
 import { Content, ContentBody, ContentId, ContentMeta, ContentRef } from "./Content";
 import { Review } from './Review';
+import { ArrayView } from './ArrayView';
 export interface SessionPayload {
     start: MultiTime;
     end: MultiTime;
@@ -28,6 +29,7 @@ export declare class Session extends Content {
     get tzOffset(): number;
     get durationMinutes(): number;
     get deviceId(): ContentId;
+    get reviews(): ArrayView<Review>;
     modelUpdated(): Promise<void>;
     addReview(review: Review): void;
 }

package/dist/models/Session.js

@@ -79,6 +79,10 @@ class Session extends Content_1.Content {
         this.checkDisposed("Session.deviceId");
         return this.payload.device_id;
     }
+    get reviews() {
+        this.checkDisposed("Session.reviews");
+        return this._reviewsView;
+    }
     async modelUpdated() {
         this.checkDisposed("Session.modelUpdated");
         await super.modelUpdated();
@@ -90,16 +94,24 @@ class Session extends Content_1.Content {
         const workspace = await this.shareSync.acquire(ContentKind_1.ContentKind.WORKSPACE, workspaceId);
         const sessionsOnDate = await workspace.acquireSessionsFromDate(sessionId, date);
         workspace.release();
-        let minutesWritingOnDate = 0;
+        let minutesStudyingOnDate = 0;
+        let reviewCountOnDate = 0;
         for (let i = 0, len = sessionsOnDate.length; i < len; i++) {
             const sessionOnDate = sessionsOnDate[i];
-            minutesWritingOnDate += sessionOnDate.durationMinutes;
+            minutesStudyingOnDate += sessionOnDate.durationMinutes;
+            reviewCountOnDate += sessionOnDate.reviews.length;
             sessionOnDate.release();
         }
-        const minutesWritingMetricId = Metric_1.Metric.makeMetricId(userId, Metric_1.MetricName.MINUTES_WRITING);
-        const minutesWritingMetric = await shareSync.acquire(ContentKind_1.ContentKind.METRIC, minutesWritingMetricId);
-        minutesWritingMetric.setDateAmount(date, minutesWritingOnDate);
-        minutesWritingMetric.release();
+        // Update minutes studying metric
+        const minutesStudyingMetricId = Metric_1.Metric.makeMetricId(userId, Metric_1.MetricName.MINUTES_STUDYING);
+        const minutesStudyingMetric = await shareSync.acquire(ContentKind_1.ContentKind.METRIC, minutesStudyingMetricId);
+        minutesStudyingMetric.setDateAmount(date, minutesStudyingOnDate);
+        minutesStudyingMetric.release();
+        // Update review count metric
+        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);
+        reviewCountMetric.release();
     }
     addReview(review) {
         this.checkDisposed("Session.addReview");

package/dist/models/Workspace.js

@@ -57,7 +57,7 @@ class Workspace extends Content_1.Content {
             const sessionCreatedAt = this.sessions.get(i);
             const sessionCreatedLocalDate = shaxpir_common_1.Time.dateFrom(sessionCreatedAt.local_time);
             if (localDate == sessionCreatedLocalDate) {
-                const sessionRef = Session_1.Session.makeSessionRef(sessionId, sessionCreatedAt);
+                const sessionRef = Session_1.Session.makeSessionRef(this.owner, sessionCreatedAt);
                 const session = await shareSync.acquire(ContentKind_1.ContentKind.SESSION, sessionRef);
                 sessions.push(session);
             }

package/package.json

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