sitero 0.5.0 → 0.7.0

package/dist/src/cms/client/interfaces/pages/dashboard/website/website-page/page.js

@@ -2,11 +2,11 @@
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useTranslator } from 'intor/react';
 import { AppWindow } from 'lucide-react';
-import { POST_TYPES } from 'sitero-domain';
 import { CMS_PATHS } from '../../../../../../../constants/paths/cms-paths.js';
 import '../../../../../../../constants/paths/redirect.js';
 import '../../../../../../../constants/cms-locale.js';
 import 'mime-types';
+import 'sitero-domain';
 import 'react';
 import 'ua-parser-js';
 import '../../../../../../../shared/client/react-query/client.js';
@@ -48,14 +48,14 @@ import { ContentContainer } from '../../../../components/ui/layouts/content-cont
 
 function createWebsitePagePage({
   pages: staticPages,
-  postFindManyAction
+  pageFindManyAction
 }) {
   return function WebsitePagePage() {
     const { t, locale } = useTranslator();
     const { data: pages } = useQuery(
-      () => postFindManyAction({ type: POST_TYPES.PAGE }),
-      ["postFindManyAction", POST_TYPES.PAGE],
-      { select: (data) => data?.posts }
+      () => pageFindManyAction({ keys: Object.keys(staticPages) }),
+      ["pageFindManyAction", Object.keys(staticPages)],
+      { select: (data) => data?.pages }
     );
     return /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(
@@ -69,10 +69,10 @@ function createWebsitePagePage({
         }
       ),
       /* @__PURE__ */ jsx(ContentContainer, { children: /* @__PURE__ */ jsx("div", { className: "flex flex-wrap max-lg:gap-3 lg:gap-6", children: ensureArray(pages).map((page, index) => {
-        const staticPage = staticPages[page.slug];
+        const staticPage = staticPages[page.key];
         const href = joinUrl(
           CMS_PATHS.website["website-page"].pathname,
-          page.slug
+          page.key
         );
         return /* @__PURE__ */ jsx(
           FeatureCard,

package/dist/src/cms/server/create-cms-server.js

@@ -13,6 +13,7 @@ import { createFileActions } from './resources/file/actions.js';
 import { createInquiryActions } from './resources/inquiry/actions.js';
 import { createPostActions } from './resources/post/actions.js';
 import { createSeoMetadataActions } from './resources/seo-metadata/actions.js';
+import { createPageActions } from './resources/page/actions.js';
 import { createAdminSessionRuntime } from './sessions/admin/admin-session-runtime.js';
 
 function createCmsServer({
@@ -53,6 +54,7 @@ function createCmsServer({
           ...actionInput
         }),
         adminRefreshToken: createAdminRefreshTokenActions(actionInput),
+        page: createPageActions(actionInput),
         config: createConfigActions(actionInput),
         file: createFileActions(actionInput),
         inquiry: createInquiryActions(actionInput),

package/dist/src/cms/server/resources/page/actions.js

@@ -0,0 +1,31 @@
+import { operationResult, PageUnavailableError } from 'sitero-server';
+
+function createPageActions({
+  resolveExecutionContext,
+  siteroServer
+}) {
+  const findDetail = async (input) => {
+    const context = await resolveExecutionContext();
+    if (!context.success) return context;
+    const page = siteroServer.resources.page;
+    if (!page) return operationResult.failure(new PageUnavailableError());
+    return siteroServer.executor.execute(page.findDetail, input, context.data);
+  };
+  const findMany = async (input) => {
+    const context = await resolveExecutionContext();
+    if (!context.success) return context;
+    const page = siteroServer.resources.page;
+    if (!page) return operationResult.failure(new PageUnavailableError());
+    return siteroServer.executor.execute(page.findMany, input, context.data);
+  };
+  const update = async (input) => {
+    const context = await resolveExecutionContext();
+    if (!context.success) return context;
+    const page = siteroServer.resources.page;
+    if (!page) return operationResult.failure(new PageUnavailableError());
+    return siteroServer.executor.execute(page.update, input, context.data);
+  };
+  return { findDetail, findMany, update };
+}
+
+export { createPageActions };

package/dist/src/cms/server/resources/post/actions.js

@@ -1,8 +1,5 @@
 import { operationResult } from 'sitero-server';
 
-function toItem(id) {
-  return id ? { id } : null;
-}
 function toItems(items) {
   return items?.map(({ id }) => ({ id })) ?? [];
 }
@@ -54,7 +51,7 @@ function toPostCreateInput({
     parents,
     relatedPosts,
     tags,
-    topicId
+    topicKey
   } = formData;
   return {
     author: author ? { id: author.id } : null,
@@ -108,7 +105,7 @@ function toPostCreateInput({
     text8: formData.text8,
     text9: formData.text9,
     text10: formData.text10,
-    topic: toItem(topicId),
+    topicKey,
     translations: formData.translations.map(toPostTranslationWriteInput),
     type: formData.type
   };
@@ -117,7 +114,11 @@ function toPostUpdateInput({
   formData,
   id
 }) {
-  const { type: _type, ...createInput } = toPostCreateInput({
+  const {
+    type: _type,
+    topicKey: _topicKey,
+    ...createInput
+  } = toPostCreateInput({
     formData
   });
   return {
@@ -156,6 +157,24 @@ function createPostActions({
       contextResult.data
     );
   };
+  const postRestoreAction = async (input) => {
+    const context = await resolveExecutionContext();
+    if (!context.success) return context;
+    return siteroServer.executor.execute(
+      siteroServer.resources.post.restore,
+      input,
+      context.data
+    );
+  };
+  const postPurgeAction = async (input) => {
+    const context = await resolveExecutionContext();
+    if (!context.success) return context;
+    return siteroServer.executor.execute(
+      siteroServer.resources.post.purge,
+      input,
+      context.data
+    );
+  };
   const postFindDetailAction = async (input) => {
     const contextResult = await resolveExecutionContext();
     if (!contextResult.success) return contextResult;
@@ -201,6 +220,8 @@ function createPostActions({
   return {
     create: postCreateAction,
     delete: postDeleteAction,
+    restore: postRestoreAction,
+    purge: postPurgeAction,
     findDetail: postFindDetailAction,
     findRelations: postFindRelationsAction,
     findListCards: postFindListCardsAction,

package/dist/src/cms/server/resources/seo-metadata/actions.js

@@ -45,7 +45,7 @@ function createSeoMetadataActions({
           ogArticleModifiedTime: normalizeDatetime(
             translation.ogArticleModifiedTime
           ),
-          // Keep server validation running for every other submitted field.
+          // Invalid JSON is rejected below before the command can write.
           jsonLd: jsonLd ?? []
         };
       }
@@ -54,31 +54,22 @@ function createSeoMetadataActions({
       ...input.formData,
       translations
     };
-    const result = await siteroServer.executor.execute(
-      siteroServer.resources.seoMetadata.upsert,
-      formData,
-      contextResult.data
-    );
     const jsonLdFields = invalidJsonLdIndexes.map((index) => ({
       path: ["translations", index, "jsonLd"],
       kind: "custom",
       code: "validation.json.invalid"
     }));
-    if (jsonLdFields.length === 0) return result;
-    if (result.success) {
+    if (jsonLdFields.length > 0) {
       return {
         success: false,
         error: { code: "VALIDATION_FAILED", fields: jsonLdFields }
       };
     }
-    if (result.error.code !== "VALIDATION_FAILED") return result;
-    return {
-      success: false,
-      error: {
-        ...result.error,
-        fields: [...result.error.fields ?? [], ...jsonLdFields]
-      }
-    };
+    return siteroServer.executor.execute(
+      siteroServer.resources.seoMetadata.upsert,
+      formData,
+      contextResult.data
+    );
   };
   return {
     upsert: seoMetadataUpsertAction

package/dist/src/config/content-ui.js

@@ -0,0 +1,24 @@
+import { hasTopicRole } from './topics.js';
+
+function deriveContentUiCapabilities(topics, features) {
+  const byTopic = Object.fromEntries(
+    Object.keys(topics).map((key) => [
+      key,
+      {
+        hasCategory: hasTopicRole(topics, key, "CATEGORY"),
+        hasSubcategory: hasTopicRole(topics, key, "SUBCATEGORY"),
+        hasTag: features.tag
+      }
+    ])
+  );
+  return {
+    hasCategory: Object.values(byTopic).some((flags) => flags.hasCategory),
+    hasSubcategory: Object.values(byTopic).some(
+      (flags) => flags.hasSubcategory
+    ),
+    hasTag: features.tag,
+    byTopic
+  };
+}
+
+export { deriveContentUiCapabilities };

package/dist/src/config/topics.js

@@ -5,7 +5,7 @@ function getTopicItemsByRole(topics, slug, items, role) {
   return (items ?? []).filter((item) => item.type === role);
 }
 function hasTopicRole(topics, slug, role) {
-  return topics[slug]?.roles.includes(role) ?? false;
+  return Object.hasOwn(topics, slug) && (topics[slug]?.roles.includes(role) ?? false);
 }
 function isContentTopic(topics, slug) {
   return hasTopicRole(topics, slug, POST_TYPES.POST) && !hasTopicRole(topics, slug, POST_TYPES.PRODUCT);

package/dist/src/constants/paths/cms-paths.js

@@ -53,8 +53,8 @@ const CMS_PATHS = {
       subcategory: {
         pathname: (topicSlug = "") => `${DB}/content/content-management/${topicSlug}/subcategory`
       },
-      topic: { pathname: `${DB}/content/content-management/topic` },
-      tag: { pathname: `${DB}/content/content-management/tag` }
+      tag: { pathname: `${DB}/content/content-management/tag` },
+      trash: { pathname: `${DB}/content/content-management/trash` }
     }
   }
 };

package/dist/src/core/infrastructure/prisma/file/include.js

@@ -1,4 +1,15 @@
 const FILE_USAGE_INCLUDE = {
+  pagesAsCoverMedia: true,
+  pagesAsSection1CoverMedia: true,
+  pagesAsSection2CoverMedia: true,
+  pagesAsSection3CoverMedia: true,
+  pagesAsSection4CoverMedia: true,
+  pagesAsSection5CoverMedia: true,
+  pagesAsSection6CoverMedia: true,
+  pagesAsSection7CoverMedia: true,
+  pagesAsSection8CoverMedia: true,
+  pagesAsSection9CoverMedia: true,
+  pagesAsSection10CoverMedia: true,
   adminAsAvatarImage: true,
   postsAsCoverImage: true,
   postsAsContentImage: true,
@@ -16,6 +27,17 @@ const FILE_USAGE_INCLUDE = {
   configsAsFile4: true
 };
 const FILE_USAGE_COUNT_SELECT = {
+  pagesAsCoverMedia: true,
+  pagesAsSection1CoverMedia: true,
+  pagesAsSection2CoverMedia: true,
+  pagesAsSection3CoverMedia: true,
+  pagesAsSection4CoverMedia: true,
+  pagesAsSection5CoverMedia: true,
+  pagesAsSection6CoverMedia: true,
+  pagesAsSection7CoverMedia: true,
+  pagesAsSection8CoverMedia: true,
+  pagesAsSection9CoverMedia: true,
+  pagesAsSection10CoverMedia: true,
   adminAsAvatarImage: true,
   postsAsCoverImage: true,
   postsAsContentImage: true,
@@ -33,6 +55,17 @@ const FILE_USAGE_COUNT_SELECT = {
   configsAsFile4: true
 };
 const FILE_NOT_IN_USE_WHERE = {
+  pagesAsCoverMedia: { none: {} },
+  pagesAsSection1CoverMedia: { none: {} },
+  pagesAsSection2CoverMedia: { none: {} },
+  pagesAsSection3CoverMedia: { none: {} },
+  pagesAsSection4CoverMedia: { none: {} },
+  pagesAsSection5CoverMedia: { none: {} },
+  pagesAsSection6CoverMedia: { none: {} },
+  pagesAsSection7CoverMedia: { none: {} },
+  pagesAsSection8CoverMedia: { none: {} },
+  pagesAsSection9CoverMedia: { none: {} },
+  pagesAsSection10CoverMedia: { none: {} },
   adminAsAvatarImage: { none: {} },
   postsAsCoverImage: { none: {} },
   postsAsContentImage: { none: {} },
@@ -54,6 +87,17 @@ const FILE_DETAIL_INCLUDE = {
   translations: true
 };
 const FILE_RELATIONS_INCLUDE = {
+  pagesAsCoverMedia: { select: { key: true } },
+  pagesAsSection1CoverMedia: { select: { key: true } },
+  pagesAsSection2CoverMedia: { select: { key: true } },
+  pagesAsSection3CoverMedia: { select: { key: true } },
+  pagesAsSection4CoverMedia: { select: { key: true } },
+  pagesAsSection5CoverMedia: { select: { key: true } },
+  pagesAsSection6CoverMedia: { select: { key: true } },
+  pagesAsSection7CoverMedia: { select: { key: true } },
+  pagesAsSection8CoverMedia: { select: { key: true } },
+  pagesAsSection9CoverMedia: { select: { key: true } },
+  pagesAsSection10CoverMedia: { select: { key: true } },
   adminAsAvatarImage: { select: { id: true } },
   postsAsCoverImage: { select: { id: true } },
   postsAsContentImage: { select: { id: true } },

package/dist/src/core/infrastructure/prisma/file/mappers.js

@@ -9,6 +9,7 @@ import 'clsx';
 import 'tailwind-merge';
 import { adminToSafe } from '../admin/base-mappers.js';
 import { configToDomain } from '../config/mappers.js';
+import { pageToDomain } from '../page/mappers.js';
 import { postToDomain } from '../post/base-mappers.js';
 import { fileToDomain } from './base-mappers.js';
 
@@ -26,9 +27,39 @@ function toFileContentData(input) {
   };
 }
 function fileDetailToDomain(file) {
+  const {
+    pagesAsCoverMedia,
+    pagesAsSection1CoverMedia,
+    pagesAsSection2CoverMedia,
+    pagesAsSection3CoverMedia,
+    pagesAsSection4CoverMedia,
+    pagesAsSection5CoverMedia,
+    pagesAsSection6CoverMedia,
+    pagesAsSection7CoverMedia,
+    pagesAsSection8CoverMedia,
+    pagesAsSection9CoverMedia,
+    pagesAsSection10CoverMedia,
+    ...base
+  } = file;
+  const pageReferences = [
+    ...pagesAsCoverMedia,
+    ...pagesAsSection1CoverMedia,
+    ...pagesAsSection2CoverMedia,
+    ...pagesAsSection3CoverMedia,
+    ...pagesAsSection4CoverMedia,
+    ...pagesAsSection5CoverMedia,
+    ...pagesAsSection6CoverMedia,
+    ...pagesAsSection7CoverMedia,
+    ...pagesAsSection8CoverMedia,
+    ...pagesAsSection9CoverMedia,
+    ...pagesAsSection10CoverMedia
+  ];
   return {
-    ...fileToDomain(file),
-    isInUse: file.adminAsAvatarImage.length > 0 || file.postsAsCoverImage.length > 0 || file.postsAsContentImage.length > 0 || file.postsAsFiles1.length > 0 || file.postsAsFiles2.length > 0 || file.postsAsFile1.length > 0 || file.postsAsFile2.length > 0 || file.postsAsFile3.length > 0 || file.postsAsFile4.length > 0 || file.configsAsFiles1.length > 0 || file.configsAsFiles2.length > 0 || file.configsAsFile1.length > 0 || file.configsAsFile2.length > 0 || file.configsAsFile3.length > 0 || file.configsAsFile4.length > 0,
+    ...fileToDomain(base),
+    isInUse: pageReferences.length > 0 || file.adminAsAvatarImage.length > 0 || file.postsAsCoverImage.length > 0 || file.postsAsContentImage.length > 0 || file.postsAsFiles1.length > 0 || file.postsAsFiles2.length > 0 || file.postsAsFile1.length > 0 || file.postsAsFile2.length > 0 || file.postsAsFile3.length > 0 || file.postsAsFile4.length > 0 || file.configsAsFiles1.length > 0 || file.configsAsFiles2.length > 0 || file.configsAsFile1.length > 0 || file.configsAsFile2.length > 0 || file.configsAsFile3.length > 0 || file.configsAsFile4.length > 0,
+    pages: [
+      ...new Map(pageReferences.map((page) => [page.id, page])).values()
+    ].map(pageToDomain),
     translations: file.translations,
     adminAsAvatarImage: file.adminAsAvatarImage.map(adminToSafe),
     postsAsCoverImage: file.postsAsCoverImage.map(postToDomain),
@@ -75,7 +106,24 @@ function fileRelationsToDomain(file) {
   return {
     adminIds: file.adminAsAvatarImage.map((admin) => admin.id),
     postIds: [...postIds],
-    configSlugs: [...configSlugs]
+    configSlugs: [...configSlugs],
+    pageKeys: [
+      ...new Set(
+        [
+          ...file.pagesAsCoverMedia,
+          ...file.pagesAsSection1CoverMedia,
+          ...file.pagesAsSection2CoverMedia,
+          ...file.pagesAsSection3CoverMedia,
+          ...file.pagesAsSection4CoverMedia,
+          ...file.pagesAsSection5CoverMedia,
+          ...file.pagesAsSection6CoverMedia,
+          ...file.pagesAsSection7CoverMedia,
+          ...file.pagesAsSection8CoverMedia,
+          ...file.pagesAsSection9CoverMedia,
+          ...file.pagesAsSection10CoverMedia
+        ].map((page) => page.key)
+      )
+    ]
   };
 }
 

package/dist/src/core/infrastructure/prisma/helpers/active-file-references.js

@@ -1,7 +1,8 @@
 import { FileNotFoundError } from 'sitero-server';
 
-async function withActiveFileReferences(prisma, items, write) {
+async function withActiveFileReferences(prisma, items, write, beforeLock) {
   return prisma.$transaction(async (transaction) => {
+    await beforeLock?.(transaction);
     const ids = [
       ...new Set(items.flatMap((item) => item ? [item.id] : []))
     ].sort();

package/dist/src/core/infrastructure/prisma/page/include.js

@@ -0,0 +1,20 @@
+const PAGE_REFERENCE_INCLUDE = {
+  translations: true
+};
+const PAGE_DETAIL_INCLUDE = {
+  ...PAGE_REFERENCE_INCLUDE,
+  seoMetadatas: true,
+  coverMedia: { include: { translations: true } },
+  section1CoverMedia: { include: { translations: true } },
+  section2CoverMedia: { include: { translations: true } },
+  section3CoverMedia: { include: { translations: true } },
+  section4CoverMedia: { include: { translations: true } },
+  section5CoverMedia: { include: { translations: true } },
+  section6CoverMedia: { include: { translations: true } },
+  section7CoverMedia: { include: { translations: true } },
+  section8CoverMedia: { include: { translations: true } },
+  section9CoverMedia: { include: { translations: true } },
+  section10CoverMedia: { include: { translations: true } }
+};
+
+export { PAGE_DETAIL_INCLUDE, PAGE_REFERENCE_INCLUDE };

package/dist/src/core/infrastructure/prisma/page/mappers.js

@@ -0,0 +1,44 @@
+import { fileToCard } from '../file/base-mappers.js';
+import { seoMetadataToDomain } from '../seo-metadata/mappers.js';
+
+function pageToDomain(page) {
+  return {
+    id: page.id,
+    key: page.key,
+    createdAt: page.createdAt,
+    updatedAt: page.updatedAt,
+    coverMediaId: page.coverMediaId,
+    section1CoverMediaId: page.section1CoverMediaId,
+    section2CoverMediaId: page.section2CoverMediaId,
+    section3CoverMediaId: page.section3CoverMediaId,
+    section4CoverMediaId: page.section4CoverMediaId,
+    section5CoverMediaId: page.section5CoverMediaId,
+    section6CoverMediaId: page.section6CoverMediaId,
+    section7CoverMediaId: page.section7CoverMediaId,
+    section8CoverMediaId: page.section8CoverMediaId,
+    section9CoverMediaId: page.section9CoverMediaId,
+    section10CoverMediaId: page.section10CoverMediaId
+  };
+}
+function pageReferenceToDomain(page) {
+  return { ...pageToDomain(page), translations: page.translations };
+}
+function pageDetailToDomain(page) {
+  return {
+    ...pageReferenceToDomain(page),
+    seoMetadatas: page.seoMetadatas.map(seoMetadataToDomain),
+    coverMedia: page.coverMedia ? fileToCard(page.coverMedia) : null,
+    section1CoverMedia: page.section1CoverMedia ? fileToCard(page.section1CoverMedia) : null,
+    section2CoverMedia: page.section2CoverMedia ? fileToCard(page.section2CoverMedia) : null,
+    section3CoverMedia: page.section3CoverMedia ? fileToCard(page.section3CoverMedia) : null,
+    section4CoverMedia: page.section4CoverMedia ? fileToCard(page.section4CoverMedia) : null,
+    section5CoverMedia: page.section5CoverMedia ? fileToCard(page.section5CoverMedia) : null,
+    section6CoverMedia: page.section6CoverMedia ? fileToCard(page.section6CoverMedia) : null,
+    section7CoverMedia: page.section7CoverMedia ? fileToCard(page.section7CoverMedia) : null,
+    section8CoverMedia: page.section8CoverMedia ? fileToCard(page.section8CoverMedia) : null,
+    section9CoverMedia: page.section9CoverMedia ? fileToCard(page.section9CoverMedia) : null,
+    section10CoverMedia: page.section10CoverMedia ? fileToCard(page.section10CoverMedia) : null
+  };
+}
+
+export { pageDetailToDomain, pageReferenceToDomain, pageToDomain };

package/dist/src/core/infrastructure/prisma/page/page-prisma-ports.js

@@ -0,0 +1,91 @@
+import { PAGE_MEDIA_FIELDS, PAGE_TEXT_FIELDS } from 'sitero-domain';
+import { PageMediaTypeInvalidError } from 'sitero-server';
+import { withActiveFileReferences } from '../helpers/active-file-references.js';
+import { PAGE_REFERENCE_INCLUDE, PAGE_DETAIL_INCLUDE } from './include.js';
+import { pageReferenceToDomain, pageDetailToDomain, pageToDomain } from './mappers.js';
+
+function createPagePrismaPorts(prisma) {
+  return {
+    pageQueryPort: {
+      async findDetail(input) {
+        const page = await prisma.page.findUnique({
+          where: input.id !== void 0 ? { id: input.id } : { key: input.key },
+          include: PAGE_DETAIL_INCLUDE
+        });
+        return page ? pageDetailToDomain(page) : null;
+      },
+      async findMany(input) {
+        if (input?.keys?.length === 0) return [];
+        const pages = await prisma.page.findMany({
+          ...input?.keys ? { where: { key: { in: input.keys } } } : {},
+          include: PAGE_REFERENCE_INCLUDE,
+          orderBy: { key: "asc" }
+        });
+        return pages.map(pageReferenceToDomain);
+      }
+    },
+    pageCommandPort: {
+      async update({ id, page }) {
+        const mediaIds = [
+          ...new Set(
+            PAGE_MEDIA_FIELDS.flatMap((field) => {
+              const id2 = page[`${field}Id`];
+              return id2 ? [id2] : [];
+            })
+          )
+        ].sort();
+        return withActiveFileReferences(
+          prisma,
+          mediaIds.map((id2) => ({ id: id2 })),
+          async (transaction) => {
+            for (const id2 of mediaIds) {
+              const file = await transaction.file.findUnique({
+                where: { id: id2 },
+                select: { type: true }
+              });
+              if (!file || file.type !== "IMAGE" && file.type !== "VIDEO")
+                throw new PageMediaTypeInvalidError();
+            }
+            const media = {};
+            for (const field of PAGE_MEDIA_FIELDS) {
+              const key = `${field}Id`;
+              const value = page[key];
+              if (value !== void 0) media[key] = value;
+            }
+            const updated = await transaction.page.update({
+              where: { id },
+              data: {
+                ...media,
+                updatedAt: /* @__PURE__ */ new Date(),
+                translations: {
+                  upsert: page.translations.map((translation) => {
+                    const update = {};
+                    const create = { locale: translation.locale };
+                    for (const key of PAGE_TEXT_FIELDS) {
+                      const value = translation[key];
+                      create[key] = value ?? null;
+                      if (value !== void 0) update[key] = value;
+                    }
+                    return {
+                      where: {
+                        pageId_locale: {
+                          pageId: id,
+                          locale: translation.locale
+                        }
+                      },
+                      update,
+                      create
+                    };
+                  })
+                }
+              }
+            });
+            return pageToDomain(updated);
+          }
+        );
+      }
+    }
+  };
+}
+
+export { createPagePrismaPorts };

package/dist/src/core/infrastructure/prisma/post/include.js

@@ -1,11 +1,14 @@
 const POST_REFERENCE_INCLUDE = {
   translations: true
 };
-const POST_LIST_CARD_INCLUDE = {
-  translations: true,
-  topic: { include: POST_REFERENCE_INCLUDE },
+const POST_REFERENCE_WITH_COVER_INCLUDE = {
+  ...POST_REFERENCE_INCLUDE,
   coverImage: { include: { translations: true } }
 };
+const POST_LIST_CARD_INCLUDE = {
+  ...POST_REFERENCE_WITH_COVER_INCLUDE,
+  parents: { include: POST_REFERENCE_WITH_COVER_INCLUDE }
+};
 const POST_DETAIL_INCLUDE = {
   ...POST_LIST_CARD_INCLUDE,
   author: {
@@ -14,12 +17,10 @@ const POST_DETAIL_INCLUDE = {
       avatarImage: { include: { translations: true } }
     }
   },
-  postsInTopic: { include: POST_REFERENCE_INCLUDE },
-  parents: { include: POST_REFERENCE_INCLUDE },
   children: { include: POST_REFERENCE_INCLUDE },
   tags: { include: POST_REFERENCE_INCLUDE },
   taggedPosts: { include: POST_REFERENCE_INCLUDE },
-  relatedPosts: { include: POST_REFERENCE_INCLUDE },
+  relatedPosts: { include: POST_LIST_CARD_INCLUDE },
   referencingPosts: { include: POST_REFERENCE_INCLUDE },
   contentImages: { include: { translations: true } },
   files1: { include: { translations: true } },
@@ -31,12 +32,11 @@ const POST_DETAIL_INCLUDE = {
   seoMetadatas: true
 };
 const POST_RELATIONS_INCLUDE = {
-  children: { where: { deletedAt: null }, select: { id: true, type: true } },
-  taggedPosts: { where: { deletedAt: null }, select: { id: true, type: true } },
+  children: { select: { id: true, type: true } },
+  taggedPosts: { select: { id: true, type: true } },
   referencingPosts: {
-    where: { deletedAt: null },
     select: { id: true, type: true }
   }
 };
 
-export { POST_DETAIL_INCLUDE, POST_LIST_CARD_INCLUDE, POST_REFERENCE_INCLUDE, POST_RELATIONS_INCLUDE };
+export { POST_DETAIL_INCLUDE, POST_LIST_CARD_INCLUDE, POST_REFERENCE_INCLUDE, POST_REFERENCE_WITH_COVER_INCLUDE, POST_RELATIONS_INCLUDE };