@ossy/resources 3.11.1 → 3.12.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ossy/resources",
   "description": "Resource domain — aggregate and events for the Ossy resource model",
-  "version": "3.11.1",
+  "version": "3.12.0",
   "private": false,
   "type": "module",
   "main": "./src/index.js",
@@ -23,9 +23,9 @@
     "src": "./src"
   },
   "dependencies": {
-    "@ossy/event-store": "^3.11.1",
-    "@ossy/fold": "^3.4.0",
-    "@ossy/platform": "^3.11.1",
+    "@ossy/event-store": "^3.12.0",
+    "@ossy/fold": "^3.12.0",
+    "@ossy/platform": "^3.12.0",
     "@ossy/schema": "^3.8.0"
   },
   "peerDependencies": {
@@ -49,5 +49,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "f279de3535b6bc76631cbc6b943dae8f92a1565f"
+  "gitHead": "c2650803219ad1831559b512848358d9550ffad2"
 }

package/src/en.translations.json

@@ -29,10 +29,6 @@
   "@ossy/resources/actions/update-access.description": "Change access settings for a resource",
   "@ossy/resources/actions/upload-named-version.label": "Upload named version",
   "@ossy/resources/actions/upload-named-version.description": "Upload a named version of a resource file",
-  "@ossy/resources/actions/create-page-view.label": "Create page view",
-  "@ossy/resources/actions/create-page-view.description": "Record a page view analytics event",
-  "@ossy/resources/actions/get-page-view-stats.label": "Get page view stats",
-  "@ossy/resources/actions/get-page-view-stats.description": "Fetch aggregated page view statistics",
   "resources/create/generic.documentTitle": "Create resource",
   "create-directory.documentTitle": "Create directory",
   "create-document.documentTitle": "Create document",

package/src/index.js

@@ -39,8 +39,6 @@ export { metadata as OpenView } from './open-view.action.js'
 export { metadata as ViewList } from './view-list.action.js'
 export { metadata as ViewGrid } from './view-grid.action.js'
 export { metadata as DoneSelecting } from './done-selecting.action.js'
-export { metadata as CreatePageView } from './create-page-view.action.js'
-export { metadata as GetPageViewStats } from './get-page-view-stats.action.js'
 export * from './AudioResource.jsx'
 export * from './CreateDirectory.jsx'
 export * from './CreateDocument.jsx'

package/src/resource-stream.js

@@ -1,5 +1,5 @@
 import { nanoid } from 'nanoid'
-import { EventStore, Mongo, withMongoReconnect } from '@ossy/event-store'
+import { EventStore, Mongo, stampAppendedEvent, withMongoReconnect } from '@ossy/event-store'
 import { createDefaultReducer } from '@ossy/fold'
 import { createLogger } from '@ossy/observability'
 
@@ -42,14 +42,12 @@ export class ResourceStream {
   static Add (event) {
     return stream => {
       const version = stream.version + 1
-      const saved = {
-        ...event,
-        type: event.type ?? stream.events[0]?.type ?? stream.state?.type,
-        id: nanoid(),
-        created: Date.now(),
+      const type = event.type ?? stream.events[0]?.type ?? stream.state?.type
+      const saved = stampAppendedEvent(event, {
         resourceId: stream.id,
         version,
-      }
+        type,
+      })
       return EventStore.AppendResourceEvent(saved)
         .then(() => {
           stream.version = version

package/src/sv.translations.json

@@ -29,10 +29,6 @@
   "@ossy/resources/actions/update-access.description": "Ändra åtkomstinställningar för en resurs",
   "@ossy/resources/actions/upload-named-version.label": "Ladda upp namngiven version",
   "@ossy/resources/actions/upload-named-version.description": "Ladda upp en namngiven version av en resursfil",
-  "@ossy/resources/actions/create-page-view.label": "Skapa sidvisning",
-  "@ossy/resources/actions/create-page-view.description": "Registrera en sidvisningshändelse för analys",
-  "@ossy/resources/actions/get-page-view-stats.label": "Hämta sidvisningsstatistik",
-  "@ossy/resources/actions/get-page-view-stats.description": "Hämta aggregerad statistik för sidvisningar",
   "resources/create/generic.documentTitle": "Skapa resurs",
   "create-directory.documentTitle": "Skapa mapp",
   "create-document.documentTitle": "Skapa dokument",

package/src/create-page-view.action.js

@@ -1 +0,0 @@
-export const metadata = { id: '@ossy/resources/actions/create-page-view', access: 'workspace' }

package/src/create-page-view.task.js

@@ -1,39 +0,0 @@
-import { nanoid } from 'nanoid'
-import { Aggregate } from '@ossy/event-store'
-import { Workspace } from '@ossy/workspaces/server'
-import { ResourcesEvents } from './resources.events.js'
-import { commitResource } from './resource-stream.helpers.js'
-
-export const metadata = { id: '@ossy/resources/tasks/create-page-view' }
-
-const PAGE_VIEW_SCHEMA_ID = '@ossy/web/schema/page-view'
-const PAGE_VIEW_LOCATION = '/@ossy/analytics/page-views/'
-
-export async function run ({ payload, req }) {
-  const workspaceId = payload?.workspaceId ?? req?.workspaceId
-  if (!workspaceId) throw Object.assign(new Error('workspaceId is required'), { status: 400 })
-
-  const workspace = await Aggregate.Of(Workspace, workspaceId).then(Aggregate.View())
-
-  const contentInput = {
-    ...(payload ?? {}),
-    userAgent: payload?.userAgent ?? req?.headers?.['user-agent'],
-    eventAt: payload?.eventAt ?? Date.now(),
-    path: payload?.path ?? '/',
-  }
-
-  const resourceId = nanoid()
-  const event = ResourcesEvents.Created({
-    resourceId,
-    schemaId: PAGE_VIEW_SCHEMA_ID,
-    createdBy: payload?.userId ?? req?.userId ?? 'public',
-    belongsTo: workspace.id,
-    location: PAGE_VIEW_LOCATION,
-    name: `${Date.now()}`,
-    content: contentInput,
-    access: 'restricted',
-  })
-
-  const resource = await commitResource(event)
-  return { id: resource.id }
-}

package/src/get-page-view-stats.action.js

@@ -1 +0,0 @@
-export const metadata = { id: '@ossy/resources/actions/get-page-view-stats', access: 'workspace' }

package/src/get-page-view-stats.task.js

@@ -1,63 +0,0 @@
-import { Aggregate } from '@ossy/event-store'
-import { Workspace } from '@ossy/workspaces/server'
-
-export const metadata = { id: '@ossy/resources/tasks/get-page-view-stats' }
-
-const PAGE_VIEW_SCHEMA_ID = '@ossy/web/schema/page-view'
-const PAGE_VIEW_LOCATION = '/@ossy/analytics/page-views/'
-
-function parseMillis(input, fallback) {
-  if (input === undefined || input === null || input === '') return fallback
-  const n = Number(input)
-  if (!Number.isFinite(n) || n <= 0) return fallback
-  return n
-}
-
-export async function run({ payload, req }) {
-  const workspaceId = payload?.workspaceId ?? req?.workspaceId
-  if (!workspaceId) throw Object.assign(new Error('workspaceId is required'), { status: 400 })
-
-  const workspace = await Aggregate.Of(Workspace, workspaceId).then(Aggregate.View())
-
-  const now = Date.now()
-  const defaultFrom = now - (30 * 24 * 60 * 60 * 1000)
-  const from = parseMillis(payload?.from ?? req?.query?.from, defaultFrom)
-  const to = parseMillis(payload?.to ?? req?.query?.to, now)
-  const topLimit = Math.min(Math.max(Number(payload?.limit ?? req?.query?.limit ?? 10), 1), 50)
-
-  const baseMatch = {
-    type: PAGE_VIEW_SCHEMA_ID,
-    'state.status': { $ne: 'removed' },
-    'state.belongsTo': workspace.id,
-    'state.location': PAGE_VIEW_LOCATION,
-    'state.content.eventAt': { $gte: from, $lte: to },
-  }
-
-  const [dailyViews, topPaths, totals] = await Promise.all([
-    Aggregate.Collection.aggregate([
-      { $match: baseMatch },
-      { $project: { date: { $dateToString: { format: '%Y-%m-%d', date: { $toDate: '$state.content.eventAt' } } } } },
-      { $group: { _id: '$date', views: { $sum: 1 } } },
-      { $sort: { _id: 1 } },
-    ]).toArray(),
-    Aggregate.Collection.aggregate([
-      { $match: baseMatch },
-      { $group: { _id: '$state.content.path', views: { $sum: 1 } } },
-      { $sort: { views: -1 } },
-      { $limit: topLimit },
-      { $project: { _id: 0, path: '$_id', views: 1 } },
-    ]).toArray(),
-    Aggregate.Collection.aggregate([
-      { $match: baseMatch },
-      { $count: 'views' },
-    ]).toArray(),
-  ])
-
-  return {
-    from,
-    to,
-    totalViews: totals?.[0]?.views || 0,
-    dailyViews: dailyViews.map(x => ({ date: x._id, views: x.views })),
-    topPaths,
-  }
-}