Release 202505312236

web/src/actions/admin/service.ts

@@ -1,6 +1,7 @@
 import { Currency, ServiceVisibility, VerificationStatus } from '@prisma/client'
 import { z } from 'astro/zod'
 import { ActionError } from 'astro:actions'
+import { uniq } from 'lodash-es'
 import slugify from 'slugify'
 
 import { defineProtectedAction } from '../../lib/defineProtectedAction'
@@ -164,11 +165,22 @@ export const adminServiceActions = {
 
       const existingService = await prisma.service.findUnique({
         where: { id: input.id },
-        include: {
-          categories: true,
+        select: {
+          slug: true,
+          previousSlugs: true,
+          categories: {
+            select: {
+              id: true,
+            },
+          },
           attributes: {
-            include: {
-              attribute: true,
+            select: {
+              attributeId: true,
+              attribute: {
+                select: {
+                  id: true,
+                },
+              },
             },
           },
         },
@@ -213,6 +225,14 @@ export const adminServiceActions = {
           serviceVisibility: input.serviceVisibility,
           slug: input.slug,
           overallScore: input.overallScore,
+          previousSlugs:
+            existingService.slug !== input.slug
+              ? {
+                  set: uniq([...existingService.previousSlugs, existingService.slug]).filter(
+                    (slug) => slug !== input.slug
+                  ),
+                }
+              : undefined,
 
           imageUrl,
           categories: {

web/src/actions/api/service.ts

@@ -44,7 +44,30 @@ export const apiServiceActions = {
             .flatMap((url) => [url, url.endsWith('/') ? url.slice(0, -1) : `${url}/`])
         : undefined
 
-      const service = await prisma.service.findFirst({
+      const select = {
+        id: true,
+        name: true,
+        slug: true,
+        description: true,
+        kycLevel: true,
+        verificationStatus: true,
+        categories: {
+          select: {
+            name: true,
+            slug: true,
+          },
+        },
+        serviceUrls: true,
+        onionUrls: true,
+        i2pUrls: true,
+        tosUrls: true,
+        referral: true,
+        listedAt: true,
+        verifiedAt: true,
+        serviceVisibility: true,
+      } as const satisfies Prisma.ServiceSelect
+
+      let service = await prisma.service.findFirst({
         where: {
           listedAt: { lte: new Date() },
           serviceVisibility: { in: ['PUBLIC', 'ARCHIVED', 'UNLISTED'] },
@@ -61,30 +84,21 @@ export const apiServiceActions = {
               : []),
           ],
         },
-        select: {
-          id: true,
-          name: true,
-          slug: true,
-          description: true,
-          kycLevel: true,
-          verificationStatus: true,
-          categories: {
-            select: {
-              name: true,
-              slug: true,
-            },
-          },
-          serviceUrls: true,
-          onionUrls: true,
-          i2pUrls: true,
-          tosUrls: true,
-          referral: true,
-          listedAt: true,
-          verifiedAt: true,
-          serviceVisibility: true,
-        },
+        select,
       })
 
+      if (!service && input.slug) {
+        service = await prisma.service.findFirst({
+          where: {
+            listedAt: { lte: new Date() },
+            serviceVisibility: { in: ['PUBLIC', 'ARCHIVED', 'UNLISTED'] },
+
+            previousSlugs: { has: input.slug },
+          },
+          select,
+        })
+      }
+
       if (
         !service ||
         (service.serviceVisibility !== 'PUBLIC' &&