refactor: refactor methods

src/application/dto/tag/tagDTO.ts

@@ -1,35 +1,15 @@
 import { getCollection } from "astro:content";
-import { TagType } from "@application/dto/tag/types";
 import type { RawTag, TagDTO } from "@application/dto/tag/types";
+import { getAuthors } from "@application/dto/tag/utils/getAuthors";
+import { getTags } from "@application/dto/tag/utils/getTags";
 import type { BaseDTO } from "@shared/application/dto/baseDTO";
-import { getArticlesByTag } from "./utils/getArticlesByTag";
 import { groupBy } from "./utils/groupBy";
 
 export const tagDTO: BaseDTO<RawTag[], Promise<TagDTO>> = {
 	create: async (raw) => {
 		const articles = await getCollection("articles");
-
-		const tags = await Promise.all(
-			raw.map(async (rawTag) => {
-				const articlesByTag = getArticlesByTag({ rawTag, articles });
-
-				return {
-					name: rawTag.fields.name as unknown as string,
-					slug: rawTag.fields.slug,
-					type: TagType.TAG,
-					count: articlesByTag.length,
-					articles: articlesByTag,
-				};
-			}),
-		);
-
-		const authors = (await getCollection("authors")).map((author) => ({
-			name: author.data.name,
-			slug: author.data.slug,
-			type: TagType.AUTHOR,
-			count: author.data.articles.length,
-			articles: author.data.articles,
-		}));
+		const tags = await getTags({ raw, articles });
+		const authors = await getAuthors();
 
 		return groupBy({
 			array: [...tags, ...authors],

src/application/dto/tag/utils/getAuthors/getAuthors.ts

@@ -0,0 +1,12 @@
+import { getCollection } from "astro:content";
+import { TagType } from "@application/dto/tag/types";
+
+export async function getAuthors() {
+	return (await getCollection("authors")).map((author) => ({
+		name: author.data.name,
+		slug: author.data.slug,
+		type: TagType.AUTHOR,
+		count: author.data.articles.length,
+		articles: author.data.articles,
+	}));
+}

src/application/dto/tag/utils/getAuthors/index.ts

@@ -0,0 +1 @@
+export * from "./getAuthors";

src/application/dto/tag/utils/getTags/getTags.ts

@@ -0,0 +1,39 @@
+import type { CollectionEntry } from "astro:content";
+import { type RawTag, TagType } from "@application/dto/tag/types";
+import type { Reference } from "@shared/application/types";
+
+interface Articles {
+	articles: CollectionEntry<"articles">[];
+}
+
+interface GetTags extends Articles {
+	raw: RawTag[];
+}
+
+interface GetArticlesByTagParams extends Articles {
+	rawTag: RawTag;
+}
+
+const getArticlesByTag = ({ rawTag, articles }: GetArticlesByTagParams): Reference<"articles">[] =>
+	articles
+		.filter(({ data: { tags } }) => tags?.some(({ slug }) => slug === String(rawTag.fields.slug)))
+		.map(({ data: { slug } }) => ({
+			id: slug,
+			collection: "articles",
+		}));
+
+export async function getTags({ raw, articles }: GetTags) {
+	return await Promise.all(
+		raw.map(async (rawTag) => {
+			const articlesByTag = getArticlesByTag({ rawTag, articles });
+
+			return {
+				name: rawTag.fields.name as unknown as string,
+				slug: rawTag.fields.slug,
+				type: TagType.TAG,
+				count: articlesByTag.length,
+				articles: articlesByTag,
+			};
+		}),
+	);
+}

src/application/dto/tag/utils/getTags/index.ts

@@ -0,0 +1 @@
+export * from "./getTags";