@dappermountain/payload-plugin-achievements 0.2.12 → 0.2.14

package/dist/collections/Logs/fields/validators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../../../src/collections/Logs/fields/validators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAQvC,eAAO,MAAM,aAAa,EAAE,QAW3B,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,QAW5B,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,QAW5B,CAAA"}
+{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../../../src/collections/Logs/fields/validators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AASvC,eAAO,MAAM,aAAa,EAAE,QAW3B,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,QA0B5B,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,QAW5B,CAAA"}

package/dist/collections/Logs/fields/validators.js

@@ -1,3 +1,4 @@
+import { collectionOf } from '../../../collections/helpers.js';
 import { eventTypeRequiresActor, eventTypeRequiresMetric, } from '../../../services/achievement/eventTypeRequiresActor.js';
 import { relationId } from '../../../services/achievement/relationId.js';
 export const validateActor = async (value, { data, req }) => {
@@ -23,9 +24,21 @@ export const validateMetric = async (value, { data, req }) => {
     if (!(await eventTypeRequiresMetric({ payload: req.payload, req, typeIdOrDoc: typeId }))) {
         return true;
     }
-    if (!relationId(value)) {
+    const metricId = relationId(value);
+    if (!metricId) {
         return 'This log type needs a metric.';
     }
+    const metric = (await req.payload.findByID({
+        collection: collectionOf('metrics'),
+        id: metricId,
+        depth: 0,
+        overrideAccess: true,
+        req,
+        select: { kind: true, name: true, slug: true },
+    }));
+    if (metric && (metric.kind ?? 'stored') === 'computed') {
+        return 'Computed metrics (for example Days) cannot be changed with a metric delta. Use a stored metric such as Points.';
+    }
     return true;
 };
 export const validateChange = async (value, { data, req }) => {

package/dist/collections/Logs/hooks/ensureTypeRequirements.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensureTypeRequirements.d.ts","sourceRoot":"","sources":["../../../../src/collections/Logs/hooks/ensureTypeRequirements.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,SAAS,CAAA;AAS3D,eAAO,MAAM,sBAAsB,EAAE,4BAkCpC,CAAA"}
+{"version":3,"file":"ensureTypeRequirements.d.ts","sourceRoot":"","sources":["../../../../src/collections/Logs/hooks/ensureTypeRequirements.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,SAAS,CAAA;AAU3D,eAAO,MAAM,sBAAsB,EAAE,4BAmDpC,CAAA"}

package/dist/collections/Logs/hooks/ensureTypeRequirements.js

@@ -1,4 +1,5 @@
 import { APIError } from 'payload';
+import { collectionOf } from '../../../collections/helpers.js';
 import { eventTypeRequiresActor, eventTypeRequiresMetric, } from '../../../services/achievement/eventTypeRequiresActor.js';
 import { relationId } from '../../../services/achievement/relationId.js';
 export const ensureTypeRequirements = async ({ data, req }) => {
@@ -23,13 +24,25 @@ export const ensureTypeRequirements = async ({ data, req }) => {
         throw new APIError('This log type needs an actor (who caused it).', 400);
     }
     if (flags.requiresMetric) {
-        if (!relationId(data.metric)) {
+        const metricId = relationId(data.metric);
+        if (!metricId) {
             throw new APIError('This log type needs a metric.', 400);
         }
         const change = data.change;
         if (typeof change !== 'number' || Number.isNaN(change)) {
             throw new APIError('This log type needs a change amount.', 400);
         }
+        const metric = (await req.payload.findByID({
+            collection: collectionOf('metrics'),
+            id: metricId,
+            depth: 0,
+            overrideAccess: true,
+            req,
+            select: { kind: true },
+        }));
+        if (metric && (metric.kind ?? 'stored') === 'computed') {
+            throw new APIError('Computed metrics cannot be changed with a metric delta. Use a stored metric such as Points.', 400);
+        }
     }
     return data;
 };

package/dist/collections/Logs/index.js

@@ -1,4 +1,4 @@
-import { catalogFilterOptions } from '../fields/catalogFilter.js';
+import { catalogFilterOptions, metricLogFilterOptions } from '../fields/catalogFilter.js';
 import { collectionAdmin, collectionOf, optionalFields, slugOf } from '../helpers.js';
 import { getAchievementOptions } from '../../options-store.js';
 import { scopeField, userField } from '../fields/index.js';
@@ -58,11 +58,11 @@ export function buildLogsCollection() {
                         name: 'metric',
                         type: 'relationship',
                         relationTo: collectionOf('metrics'),
-                        filterOptions: catalogFilterOptions,
+                        filterOptions: metricLogFilterOptions,
                         validate: validateMetric,
                         admin: {
                             width: '50%',
-                            description: 'Which score moved.',
+                            description: 'Which stored score moved (computed metrics like Days cannot be chosen here).',
                             components: {
                                 Field: {
                                     path: '@dappermountain/payload-plugin-achievements/client#MetricField',

package/dist/collections/fields/catalogFilter.d.ts

@@ -1,8 +1,14 @@
-import type { Where } from 'payload';
+import type { FilterOptions, Where } from 'payload';
 /** Relationship picker: same scope as the parent doc, or unscoped (global) catalog rows. */
 export declare function catalogFilterOptions({ data }: {
     data?: {
         scope?: unknown;
     };
 }): Where | true;
+/**
+ * Metric picker on achievement logs: same scope rules as other catalog fields,
+ * but when the log type needs a metric (e.g. `metric.delta`), only **stored**
+ * metrics are offered — computed metrics (like Days) cannot receive deltas.
+ */
+export declare const metricLogFilterOptions: FilterOptions;
 //# sourceMappingURL=catalogFilter.d.ts.map

package/dist/collections/fields/catalogFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"catalogFilter.d.ts","sourceRoot":"","sources":["../../../src/collections/fields/catalogFilter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAIpC,4FAA4F;AAC5F,wBAAgB,oBAAoB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAA;CAAE,GAAG,KAAK,GAAG,IAAI,CAM3F"}
+{"version":3,"file":"catalogFilter.d.ts","sourceRoot":"","sources":["../../../src/collections/fields/catalogFilter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAKnD,4FAA4F;AAC5F,wBAAgB,oBAAoB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAA;CAAE,GAAG,KAAK,GAAG,IAAI,CAM3F;AAED;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,EAAE,aAqBpC,CAAA"}

package/dist/collections/fields/catalogFilter.js

@@ -1,3 +1,4 @@
+import { eventTypeRequiresMetric } from '../../services/achievement/eventTypeRequiresActor.js';
 import { relationId } from '../../services/achievement/relationId.js';
 /** Relationship picker: same scope as the parent doc, or unscoped (global) catalog rows. */
 export function catalogFilterOptions({ data }) {
@@ -8,3 +9,28 @@ export function catalogFilterOptions({ data }) {
         or: [{ scope: { equals: scopeId } }, { scope: { exists: false } }, { scope: { equals: null } }],
     };
 }
+/**
+ * Metric picker on achievement logs: same scope rules as other catalog fields,
+ * but when the log type needs a metric (e.g. `metric.delta`), only **stored**
+ * metrics are offered — computed metrics (like Days) cannot receive deltas.
+ */
+export const metricLogFilterOptions = async ({ data, req }) => {
+    const scopeFilter = catalogFilterOptions({ data: data });
+    const typeId = relationId(data?.type);
+    let storedOnly = false;
+    if (typeId && req?.payload) {
+        storedOnly = await eventTypeRequiresMetric({
+            payload: req.payload,
+            req,
+            typeIdOrDoc: typeId,
+        });
+    }
+    if (!storedOnly)
+        return scopeFilter;
+    const storedWhere = {
+        or: [{ kind: { equals: 'stored' } }, { kind: { exists: false } }, { kind: { equals: null } }],
+    };
+    if (scopeFilter === true)
+        return storedWhere;
+    return { and: [scopeFilter, storedWhere] };
+};

package/dist/services/achievement/tierProgression.d.ts

@@ -1,4 +1,9 @@
 import type { PayloadRequest } from 'payload';
+/**
+ * Ensure a tier request exists when unlock rules pass.
+ * Prefer open (pending/approved) rows. If only a **rejected** request exists,
+ * leave it alone — do not auto-queue a new pending after a denial.
+ */
 export declare function ensureTierRequest(args: {
     req: PayloadRequest;
     userId: string;
@@ -9,7 +14,8 @@ export declare function ensureTierRequest(args: {
     created: boolean;
 }>;
 /**
- * When unlock rules pass and the tier requires review, ensure a pending/approved request exists.
+ * When unlock rules pass and the tier requires review, ensure a request exists.
+ * Does not recreate a request after rejection — reopen by updating that row or creating manually.
  */
 export declare function syncTierProgression(args: {
     req: PayloadRequest;

package/dist/services/achievement/tierProgression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tierProgression.d.ts","sourceRoot":"","sources":["../../../src/services/achievement/tierProgression.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,SAAS,CAAA;AAgBpD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CACvB,GAAG,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAsC9D;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CACvB,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CA0DjC;AAED,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA"}
+{"version":3,"file":"tierProgression.d.ts","sourceRoot":"","sources":["../../../src/services/achievement/tierProgression.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,SAAS,CAAA;AAqBpD;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CACvB,GAAG,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAqD9D;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CACvB,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CA0DjC;AAED,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA"}

package/dist/services/achievement/tierProgression.js

@@ -2,26 +2,48 @@ import { collectionOf } from '../../collections/helpers.js';
 import { CTX_SYSTEM_REQUEST } from './contextFlags.js';
 import { evaluateRules } from './evaluateRules.js';
 import { hasApprovedTierRequest } from './tierApproval.js';
+function tierRequestScopeClauses(scopeId) {
+    if (scopeId)
+        return [{ scope: { equals: scopeId } }];
+    return [{ scope: { exists: false } }];
+}
+/**
+ * Ensure a tier request exists when unlock rules pass.
+ * Prefer open (pending/approved) rows. If only a **rejected** request exists,
+ * leave it alone — do not auto-queue a new pending after a denial.
+ */
 export async function ensureTierRequest(args) {
-    const clauses = [
+    const base = [
         { user: { equals: args.userId } },
         { tier: { equals: args.tierId } },
-        { status: { in: ['pending', 'approved'] } },
+        ...tierRequestScopeClauses(args.scopeId),
     ];
-    if (args.scopeId)
-        clauses.push({ scope: { equals: args.scopeId } });
-    else
-        clauses.push({ scope: { exists: false } });
-    const existing = await args.req.payload.find({
+    const open = await args.req.payload.find({
+        collection: collectionOf('tierRequests'),
+        depth: 0,
+        limit: 1,
+        overrideAccess: true,
+        req: args.req,
+        where: {
+            and: [...base, { status: { in: ['pending', 'approved'] } }],
+        },
+    });
+    if (open.docs[0]) {
+        return { doc: open.docs[0], created: false };
+    }
+    const rejected = await args.req.payload.find({
         collection: collectionOf('tierRequests'),
         depth: 0,
         limit: 1,
         overrideAccess: true,
         req: args.req,
-        where: { and: clauses },
+        sort: '-updatedAt',
+        where: {
+            and: [...base, { status: { equals: 'rejected' } }],
+        },
     });
-    if (existing.docs[0]) {
-        return { doc: existing.docs[0], created: false };
+    if (rejected.docs[0]) {
+        return { doc: rejected.docs[0], created: false };
     }
     args.req.context[CTX_SYSTEM_REQUEST] = true;
     try {
@@ -43,7 +65,8 @@ export async function ensureTierRequest(args) {
     }
 }
 /**
- * When unlock rules pass and the tier requires review, ensure a pending/approved request exists.
+ * When unlock rules pass and the tier requires review, ensure a request exists.
+ * Does not recreate a request after rejection — reopen by updating that row or creating manually.
  */
 export async function syncTierProgression(args) {
     const scopeId = args.scopeId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dappermountain/payload-plugin-achievements",
-  "version": "0.2.12",
+  "version": "0.2.14",
   "description": "A robust, Admin-configured achievements engine for Payload: composable unlock rules, derived rank progress, request/review grants, metrics, and scoped multi-tenant support.",
   "license": "MIT",
   "type": "module",