@ossy/resources 1.12.2 → 1.12.3

package/src/resource-stream.js

@@ -0,0 +1,108 @@
+import { nanoid } from 'nanoid'
+import { EventStore, Mongo, withMongoReconnect } from '@ossy/event-store'
+import { createDefaultReducer } from '@ossy/fold'
+import { createLogger } from '@ossy/observability'
+
+const log = createLogger('@ossy/resources')
+
+const reduce = createDefaultReducer()
+
+/**
+ * ADR 0008 resource stream — keyed by `resourceId`, events use `{ type, event, version, payload }`.
+ */
+export class ResourceStream {
+
+  static get Collection () {
+    return Mongo.db.collection('aggregates')
+  }
+
+  /**
+   * @param {string | object} identifier resourceId or a Created event partial
+   */
+  static Of (identifier) {
+    if (typeof identifier === 'object' && identifier !== null) {
+      const resourceId = identifier.resourceId ?? nanoid()
+      return Promise.resolve(new ResourceStream(resourceId, [], null))
+    }
+
+    return ResourceStream.Find(identifier)
+      .then(snapshot =>
+        EventStore.GetResourceStream({ resourceId: identifier, fromVersion: snapshot?.version ?? 0 })
+          .then(events => new ResourceStream(identifier, events, snapshot)),
+      )
+  }
+
+  static Find (resourceId) {
+    return withMongoReconnect(() => ResourceStream.Collection.findOne({ id: resourceId }))
+  }
+
+  /**
+   * @param {object} event partial resource event (without id, created, version)
+   */
+  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(),
+        resourceId: stream.id,
+        version,
+      }
+      return EventStore.AppendResourceEvent(saved)
+        .then(() => {
+          stream.version = version
+          stream.events = [...stream.events, saved]
+          return stream
+        })
+    }
+  }
+
+  static Save () {
+    return stream => {
+      if (!stream.events?.length) return Promise.resolve()
+
+      const latestVersion = stream.events[stream.events.length - 1]?.version ?? stream.version
+      const state = reduce(stream.events, stream.state)
+      const schemaId = state.type ?? stream.events[0]?.type
+
+      return withMongoReconnect(() =>
+        ResourceStream.Collection.updateOne(
+          { id: stream.id },
+          {
+            $set: {
+              id: stream.id,
+              version: latestVersion,
+              type: schemaId,
+              state,
+            },
+          },
+          { upsert: true },
+        ),
+      ).catch(err => {
+        log.error(`[ResourceStream] save failed for ${stream.id}`, undefined, err)
+        throw err
+      })
+    }
+  }
+
+  static View () {
+    return stream => reduce(stream.events, stream.state)
+  }
+
+  /**
+   * @param {string} id resourceId
+   * @param {object[]} events
+   * @param {object} [snapshot]
+   */
+  constructor (id, events, snapshot) {
+    this.id = id
+    this.version = snapshot?.version ?? 0
+    this.state = snapshot?.state
+    this.events = events ?? []
+    this.View = reduce
+  }
+}
+
+export { ResourceStream as Aggregate }

package/src/resource.helpers.js

@@ -48,36 +48,36 @@ export async function uploadFile(sdk, uploadLocation, file) {
 }
 
 export async function removeResource(sdk, id, location) {
-  await sdk.invoke(DeleteResource, { id })
+  await sdk.invoke(DeleteResource, { resourceId: id })
   if (location) invalidateLocation(sdk, location)
-  sdk.invalidate(cacheKey({ id: 'resources/get' }, { id }))
+  sdk.invalidate(cacheKey({ id: '@ossy/resources/actions/get' }, { resourceId: id }))
 }
 
 export async function updateResourceContent(sdk, id, content) {
-  const resource = await sdk.invoke(UpdateResourceContent, { id, content })
+  const resource = await sdk.invoke(UpdateResourceContent, { resourceId: id, content })
   invalidateLocation(sdk, resource.location)
-  sdk.invalidate(cacheKey({ id: 'resources/get' }, { id }))
+  sdk.invalidate(cacheKey({ id: '@ossy/resources/actions/get' }, { resourceId: id }))
   return resource
 }
 
 export async function moveResource(sdk, id, target, sourceLocation) {
-  const resource = await sdk.invoke(UpdateResourceLocation, { id, target })
+  const resource = await sdk.invoke(UpdateResourceLocation, { resourceId: id, target })
   invalidateLocation(sdk, resource.location)
   if (sourceLocation) invalidateLocation(sdk, sourceLocation)
-  sdk.invalidate(cacheKey({ id: 'resources/get' }, { id }))
+  sdk.invalidate(cacheKey({ id: '@ossy/resources/actions/get' }, { resourceId: id }))
   return resource
 }
 
 export async function renameResource(sdk, id, name) {
-  const resource = await sdk.invoke(UpdateResourceName, { id, name })
+  const resource = await sdk.invoke(UpdateResourceName, { resourceId: id, name })
   invalidateLocation(sdk, resource.location)
-  sdk.invalidate(cacheKey({ id: 'resources/get' }, { id }))
+  sdk.invalidate(cacheKey({ id: '@ossy/resources/actions/get' }, { resourceId: id }))
   return resource
 }
 
 export async function updateResourceAccess(sdk, params) {
   const resource = await sdk.invoke(UpdateResourceAccess, params)
   invalidateLocation(sdk, resource.location)
-  sdk.invalidate(cacheKey({ id: 'resources/get' }, { id: params.id }))
+  sdk.invalidate(cacheKey({ id: '@ossy/resources/actions/get' }, { resourceId: params.resourceId ?? params.id }))
   return resource
 }

package/src/resources.attach-media-urls.js

@@ -4,8 +4,8 @@ import { Workspace } from '@ossy/workspaces/server'
 
 /**
  * Adds `content.src` (and `content.sizes[*]` URLs) for file resources, respecting
- * `access` and workspace membership. Restricted resources get short-lived S3 presigned GETs
- * for members only; public resources get CDN URLs for any caller.
+ * `access` and workspace membership. All backends expose the same read URL shape:
+ * `/r/{resourceId}` (derivatives: `/r/{resourceId}/{variant}`).
  *
  * @param {object} resource - Resource view
  * @param {{ userId?: string, workspaceId?: string }} context
@@ -22,7 +22,13 @@ export async function attachResourceMediaUrls(resource, { userId, workspaceId }
 
   const access = resource.access || 'restricted'
   const isMember = Boolean(userId && workspace?.users?.includes(userId))
-  const allowMedia = access === 'public' || (access === 'restricted' && isMember)
+  const inWorkspaceContext = Boolean(
+    userId && workspaceId && resource.belongsTo === workspaceId,
+  )
+  const allowMedia =
+    access === 'public' ||
+    (access === 'workspace' && inWorkspaceContext) ||
+    (access === 'restricted' && isMember)
 
   const nextContent = { ...resource.content }
 

package/src/resources.events.js

@@ -1,98 +1,59 @@
 /**
-  * Database queries related to workspace events
-  * @class
-  */
+ * ADR 0008 resource lifecycle events.
+ */
 export class ResourcesEvents {
 
-  static Created({
-    aggregateId, //optional
+  static Created ({
+    resourceId,
+    schemaId,
     createdBy,
     belongsTo,
     location,
-    type,
     name,
-    ...specificTypeProps
+    access,
+    content,
+    ...rest
   }) {
-    return ({
-      aggregateId: aggregateId,
-      type: 'Created',
-      aggregateType: 'Resource',
-      createdBy: createdBy,
+    return {
+      type: schemaId,
+      resourceId,
+      event: 'Created',
+      createdBy,
       payload: {
-        ...specificTypeProps,
-        belongsTo: belongsTo,
-        location: location,
-        type: type,
-        name: name
-      }
-    })
+        belongsTo,
+        location,
+        name,
+        access,
+        content: content ?? {},
+        ...rest,
+      },
+    }
   }
 
-  static ContentUpdated({ createdBy, content }) {
-    return ({
-      type: 'ContentUpdated',
-      createdBy: createdBy,
-      payload: {
-        content: content
-      }
-    })
- }
-
-  static NameUpdated({ createdBy, name }) {
-    return ({
-      type: 'NameUpdated',
-      createdBy: createdBy,
-      payload: {
-        name: name
-      }
-    })
-   }
-
-  static AccessUpdated({ createdBy, access }) {
-    return ({
-      type: 'AccessUpdated',
-      createdBy: createdBy,
-      payload: {
-        access: access
-      }
-    })
-   }
-
-  static LocationUpdated({ createdBy, location }) {
-    return ({
-      type: 'LocationUpdated',
-      createdBy: createdBy,
-      payload: {
-        location: location
-      }
-    })
-   }
-
-  static Deleted({ createdBy }) {
-    return ({
-      type: 'Deleted',
-      createdBy: createdBy
-    })
+  static Patched ({ createdBy, ...partial }) {
+    return {
+      event: 'Patched',
+      createdBy,
+      payload: partial,
+    }
   }
 
-  // TODO: remove named version concept
-  static NamedVersionUploaded({
-    createdBy,
-    namedVersion,
-    ContentLength,
-    ContentType,
-    Key
-  }) {
-    return ({
-      type: 'NamedVersionUploaded',
-      createdBy: createdBy,
+  static Updated ({ createdBy, content, name }) {
+    return {
+      event: 'Updated',
+      createdBy,
       payload: {
-        namedVersion,
-        Key,
-        ContentLength,
-        ContentType,
-      }
-    })
+        ...(content !== undefined ? { content } : {}),
+        ...(name !== undefined ? { name } : {}),
+      },
+    }
   }
 
+  static Deleted ({ createdBy }) {
+    return {
+      event: 'Deleted',
+      createdBy,
+      payload: {},
+    }
+  }
 }

package/src/{resources.spec.js → resources.integration.spec.js}

@@ -9,58 +9,58 @@ function workspaceHeaders(userToken, workspaceId) {
   }
 }
 
-describe('[resources/create]', () => {
+describe('[resources/actions/create]', () => {
 
   TestUtil.AssertWorkspaceActionAuthenticationNeeded({
-    actionId: 'resources/create',
+    actionId: '@ossy/resources/actions/create',
     payload: { type: 'directory', location: '/', name: 'test' },
     headers: { workspaceId: 'ws-test' },
   })
 
 })
 
-describe('[resources/list]', () => {
+describe('[resources/actions/list]', () => {
   TestUtil.AssertWorkspaceActionAuthenticationNeeded({
-    actionId: 'resources/list',
+    actionId: '@ossy/resources/actions/list',
     headers: { workspaceId: 'ws-test' },
   })
 })
 
-describe('[resources/get]', () => {
+describe('[resources/actions/get]', () => {
   TestUtil.AssertWorkspaceActionAuthenticationNeeded({
-    actionId: 'resources/get',
+    actionId: '@ossy/resources/actions/get',
     payload: { resourceId: 'r1' },
     headers: { workspaceId: 'ws-test' },
   })
 })
 
-describe('[resources/update-name]', () => {
+describe('[resources/actions/update-name]', () => {
   TestUtil.AssertWorkspaceActionAuthenticationNeeded({
-    actionId: 'resources/update-name',
+    actionId: '@ossy/resources/actions/update-name',
     payload: { resourceId: 'r1', name: 'x' },
     headers: { workspaceId: 'ws-test' },
   })
 })
 
-describe('[resources/update-location]', () => {
+describe('[resources/actions/update-location]', () => {
   TestUtil.AssertWorkspaceActionAuthenticationNeeded({
-    actionId: 'resources/update-location',
+    actionId: '@ossy/resources/actions/update-location',
     payload: { resourceId: 'r1', target: '/other/' },
     headers: { workspaceId: 'ws-test' },
   })
 })
 
-describe('[resources/update-content]', () => {
+describe('[resources/actions/update-content]', () => {
   TestUtil.AssertWorkspaceActionAuthenticationNeeded({
-    actionId: 'resources/update-content',
+    actionId: '@ossy/resources/actions/update-content',
     payload: { resourceId: 'r1', content: {} },
     headers: { workspaceId: 'ws-test' },
   })
 })
 
-describe('[resources/delete]', () => {
+describe('[resources/actions/delete]', () => {
   TestUtil.AssertWorkspaceActionAuthenticationNeeded({
-    actionId: 'resources/delete',
+    actionId: '@ossy/resources/actions/delete',
     payload: { resourceId: 'r1' },
     headers: { workspaceId: 'ws-test' },
   })
@@ -70,7 +70,7 @@ describe('E2E: template-backed resource (workspaceId header)', () => {
   it('create → update content → delete', async () => {
     const user = await TestUtil.GetAuthenticatedTestUser()
     const workspace = await TestUtil.InvokeAction({
-      actionId: 'workspaces/create',
+      actionId: '@ossy/workspaces/actions/create',
       headers: { 'Content-Type': 'application/json', Authorization: user.token },
       payload: { name: casual.word },
     }).then(r => r.json())
@@ -88,7 +88,7 @@ describe('E2E: template-backed resource (workspaceId header)', () => {
     }
 
     const createRes = await TestUtil.InvokeAction({
-      actionId: 'resources/create',
+      actionId: '@ossy/resources/actions/create',
       headers: workspaceHeaders(user.token, workspace.id),
       payload: createBody,
     })
@@ -103,7 +103,7 @@ describe('E2E: template-backed resource (workspaceId header)', () => {
     })
 
     const updateRes = await TestUtil.InvokeAction({
-      actionId: 'resources/update-content',
+      actionId: '@ossy/resources/actions/update-content',
       headers: workspaceHeaders(user.token, workspace.id),
       payload: {
         resourceId: created.id,
@@ -124,7 +124,7 @@ describe('E2E: template-backed resource (workspaceId header)', () => {
     })
 
     const deleteRes = await TestUtil.InvokeAction({
-      actionId: 'resources/delete',
+      actionId: '@ossy/resources/actions/delete',
       headers: workspaceHeaders(user.token, workspace.id),
       payload: { resourceId: created.id },
     })
@@ -134,7 +134,7 @@ describe('E2E: template-backed resource (workspaceId header)', () => {
     expect(deleteBody).toEqual({ ok: true })
 
     const listRes = await TestUtil.InvokeAction({
-      actionId: 'resources/list',
+      actionId: '@ossy/resources/actions/list',
       headers: workspaceHeaders(user.token, workspace.id),
       payload: { query: { location: '/' } },
     })

package/src/resources.queries.js

@@ -36,7 +36,7 @@ export function accessFilter(user) {
   if (!user?.anonymous) {
     if (user?.workspaces?.length) {
       conditions.push({
-        'state.access': { $in: ['public', 'workspace'] },
+        'state.access': { $in: ['public', 'workspace', 'restricted'] },
         'state.belongsTo': { $in: user.workspaces },
       })
     }
@@ -73,7 +73,10 @@ export class ResourcesQueries {
     const workspaceScope = query['state.belongsTo'] ?? '(no workspace scope)'
     log.info(`[ResourcesQueries][GetResources] Fetching resources for ${workspaceScope}`)
 
-    const baseQuery = { ...query, type: 'Resource' }
+    const baseQuery = {
+      ...query,
+      type: { $regex: /^@[^/]+\/[^/]+\/schema\// },
+    }
     const mongoQuery = user ? { $and: [baseQuery, accessFilter(user)] } : baseQuery
 
     return Aggregate.Collection.find(mongoQuery, { state: true }).toArray()

package/src/search.action.js

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

package/src/search.task.js

@@ -1,7 +1,7 @@
 import { ResourcesQueries } from './resources.queries.js'
 import { mediaContextFromRun, withResourceMedia } from './resources.action-media.js'
 
-export const metadata = { id: 'resources/search' }
+export const metadata = { id: '@ossy/resources/tasks/search' }
 
 export async function run({ payload, req }) {
   const query = { ...(payload ?? {}) }

package/src/server.js

@@ -1,4 +1,5 @@
-export * from './resource.aggregate.js'
+export * from './resource-stream.js'
+export * from './resource-stream.helpers.js'
 export * from './resources.events.js'
 export * from './resources.queries.js'
 export { attachResourceMediaUrls } from './resources.attach-media-urls.js'

package/src/sv.translations.json

@@ -7,30 +7,30 @@
   "resources.form.selectType": "Välj en resurstyp för att fortsätta.",
   "resources.form.createFailed": "Skapandet misslyckades",
   "resources.form.createResource": "Skapa resurs",
-  "resources/create.label": "Skapa resurs",
-  "resources/create.description": "Skapa en ny resurs i workspace",
-  "resources/list.label": "Lista resurser",
-  "resources/list.description": "Lista resurser på en plats i workspace",
-  "resources/get.label": "Hämta resurs",
-  "resources/get.description": "Hämta en enskild resurs via id",
-  "resources/search.label": "Sök resurser",
-  "resources/search.description": "Sök resurser i en workspace",
-  "resources/delete.label": "Ta bort resurs",
-  "resources/delete.description": "Ta bort en resurs från workspace",
-  "resources/update-name.label": "Uppdatera resursnamn",
-  "resources/update-name.description": "Byt namn på en resurs i workspace",
-  "resources/update-content.label": "Uppdatera resursinnehåll",
-  "resources/update-content.description": "Uppdatera innehållet i en resurs",
-  "resources/update-location.label": "Uppdatera resursplats",
-  "resources/update-location.description": "Flytta en resurs till en ny plats",
-  "resources/update-access.label": "Uppdatera resursåtkomst",
-  "resources/update-access.description": "Ändra åtkomstinställningar för en resurs",
-  "resources/upload-named-version.label": "Ladda upp namngiven version",
-  "resources/upload-named-version.description": "Ladda upp en namngiven version av en resursfil",
-  "resources/create-page-view.label": "Skapa sidvisning",
-  "resources/create-page-view.description": "Registrera en sidvisningshändelse för analys",
-  "resources/get-page-view-stats.label": "Hämta sidvisningsstatistik",
-  "resources/get-page-view-stats.description": "Hämta aggregerad statistik för sidvisningar",
+  "@ossy/resources/actions/create.label": "Skapa resurs",
+  "@ossy/resources/actions/create.description": "Skapa en ny resurs i workspace",
+  "@ossy/resources/actions/list.label": "Lista resurser",
+  "@ossy/resources/actions/list.description": "Lista resurser på en plats i workspace",
+  "@ossy/resources/actions/get.label": "Hämta resurs",
+  "@ossy/resources/actions/get.description": "Hämta en enskild resurs via id",
+  "@ossy/resources/actions/search.label": "Sök resurser",
+  "@ossy/resources/actions/search.description": "Sök resurser i en workspace",
+  "@ossy/resources/actions/delete.label": "Ta bort resurs",
+  "@ossy/resources/actions/delete.description": "Ta bort en resurs från workspace",
+  "@ossy/resources/actions/update-name.label": "Uppdatera resursnamn",
+  "@ossy/resources/actions/update-name.description": "Byt namn på en resurs i workspace",
+  "@ossy/resources/actions/update-content.label": "Uppdatera resursinnehåll",
+  "@ossy/resources/actions/update-content.description": "Uppdatera innehållet i en resurs",
+  "@ossy/resources/actions/update-location.label": "Uppdatera resursplats",
+  "@ossy/resources/actions/update-location.description": "Flytta en resurs till en ny plats",
+  "@ossy/resources/actions/update-access.label": "Uppdatera resursåtkomst",
+  "@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/update-access.action.js

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

package/src/update-access.task.js

@@ -1,13 +1,13 @@
-import { Aggregate } from '@ossy/event-store'
-import { Resource } from './resource.aggregate.js'
 import { ResourcesEvents } from './resources.events.js'
+import { mutateResource } from './resource-stream.helpers.js'
+import { resolveResourceId } from './resource-read.helpers.js'
 import { mediaContextFromRun, withResourceMedia } from './resources.action-media.js'
 
-export const metadata = { id: 'resources/update-access' }
+export const metadata = { id: '@ossy/resources/tasks/update-access' }
 
-export async function run({ payload, req }) {
+export async function run ({ payload, req }) {
   const createdBy = payload?.userId ?? req?.userId
-  const resourceId = payload?.resourceId ?? req?.params?.resourceId
+  const resourceId = resolveResourceId({ payload, req })
   const resourceAccess = payload?.access
 
   if (!resourceId) throw Object.assign(new Error('resourceId is required'), { status: 400 })
@@ -15,8 +15,9 @@ export async function run({ payload, req }) {
     throw Object.assign(new Error(`Invalid access value: ${resourceAccess}`), { status: 400 })
   }
 
-  const resource = await Aggregate.Of(Resource, resourceId)
-    .then(Aggregate.Add(ResourcesEvents.AccessUpdated({ createdBy, access: resourceAccess })))
-    .then(Aggregate.View())
+  const resource = await mutateResource(
+    resourceId,
+    ResourcesEvents.Patched({ createdBy, access: resourceAccess }),
+  )
   return withResourceMedia(resource, mediaContextFromRun({ payload, req }))
 }

package/src/update-content.action.js

@@ -1 +1 @@
-export const metadata = { id: 'resources/update-content', access: 'workspace' }
+export const metadata = { id: '@ossy/resources/actions/update-content', access: 'workspace' }

package/src/update-content.task.js

@@ -1,41 +1,39 @@
 import { Aggregate } from '@ossy/event-store'
-import { Resource } from './resource.aggregate.js'
-import { ResourcesEvents } from './resources.events.js'
 import { Workspace } from '@ossy/workspaces/server'
-import { getSystemResourceTemplates, normalizeAndValidateDocumentContent } from '@ossy/platform'
+import { schemaForWorkspace } from '@ossy/platform'
+import { ResourcesEvents } from './resources.events.js'
+import { mutateResource, viewResource } from './resource-stream.helpers.js'
 import { mediaContextFromRun, withResourceMedia } from './resources.action-media.js'
+import { resolveResourceId } from './resource-read.helpers.js'
 
-export const metadata = { id: 'resources/update-content' }
+export const metadata = { id: '@ossy/resources/tasks/update-content' }
 
-export async function run({ payload, req }) {
+export async function run ({ payload, req }) {
   const createdBy = payload?.userId ?? req?.userId
-  const resourceId = payload?.resourceId ?? req?.params?.resourceId
+  const resourceId = resolveResourceId({ payload, req })
   const content = payload?.content
   const workspaceId = payload?.workspaceId ?? req?.workspaceId
 
   if (!resourceId) throw Object.assign(new Error('resourceId is required'), { status: 400 })
 
   const workspace = await Aggregate.Of(Workspace, workspaceId).then(Aggregate.View())
+  const current = await viewResource(resourceId)
+
+  const engine = schemaForWorkspace(workspace.schemas)
+  const schema = engine.has(current.type) ? engine.resolve(current.type) : null
+  let finalContent = content
+  if (schema) {
+    const result = engine.validate(schema, content)
+    if (!result.ok) {
+      const first = result.errors[0]
+      throw Object.assign(new Error(first.message), { status: 400, type: first.code })
+    }
+    finalContent = result.data
+  }
 
-  return Aggregate.Of(Resource, resourceId)
-    .then(aggregate => {
-      const resource = Aggregate.View()(aggregate)
-      const systemTemplates = getSystemResourceTemplates()
-      const allTemplates = [
-        ...systemTemplates,
-        ...(workspace.resourceTemplates || []).filter(t => !systemTemplates.find(s => s.id === t.id)),
-      ]
-      const template = allTemplates.find(t => t.id === resource.type)
-      let finalContent = content
-      if (template) {
-        const normalized = normalizeAndValidateDocumentContent(content, template)
-        if (!normalized.ok) {
-          throw Object.assign(new Error(normalized.message), { status: 400, type: normalized.code })
-        }
-        finalContent = normalized.content
-      }
-      return Aggregate.Add(ResourcesEvents.ContentUpdated({ createdBy, content: finalContent }))(aggregate)
-    })
-    .then(Aggregate.View())
-    .then(resource => withResourceMedia(resource, mediaContextFromRun({ payload, req })))
+  const updated = await mutateResource(
+    resourceId,
+    ResourcesEvents.Updated({ createdBy, content: finalContent }),
+  )
+  return withResourceMedia(updated, mediaContextFromRun({ payload, req }))
 }

package/src/update-location.action.js

@@ -1 +1 @@
-export const metadata = { id: 'resources/update-location', access: 'workspace' }
+export const metadata = { id: '@ossy/resources/actions/update-location', access: 'workspace' }