@eventcatalog/core 2.25.1 → 2.26.1

package/eventcatalog/src/pages/docs/users/[id]/index.astro

@@ -2,6 +2,7 @@
 import components from '@components/MDX/components';
 
 // SideBars
+import { render } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import OwnersList from '@components/Lists/OwnersList';
 import PillListFlat from '@components/Lists/PillListFlat';
@@ -11,23 +12,16 @@ import { buildUrl } from '@utils/url-builder';
 import VerticalSideBarLayout from '@layouts/VerticalSideBarLayout.astro';
 
 export async function getStaticPaths() {
-  const teams = await getUsers();
+  const users = await getUsers();
 
-  return teams.map((team) => ({
-    params: {
-      type: team.collection,
-      id: team.data.id,
-    },
-    props: {
-      type: 'team',
-      ...team,
-    },
+  return users.map((user) => ({
+    params: { id: user.data.id },
+    props: user,
   }));
 }
 
-const { render, ...props } = Astro.props;
-
-const { Content } = await render();
+const props = Astro.props;
+const { Content } = await render(props);
 
 const domains = props.data.ownedDomains as CollectionEntry<'domains'>[];
 const services = props.data.ownedServices as CollectionEntry<'services'>[];

package/eventcatalog/src/utils/collections/domains.ts

@@ -2,6 +2,7 @@ import { getItemsFromCollectionByIdAndSemverOrLatest, getVersionForCollectionIte
 import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import path from 'path';
+import type { CollectionMessageTypes } from '@types';
 
 const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
 
@@ -73,6 +74,32 @@ export const getDomains = async ({ getAllVersions = true }: Props = {}): Promise
   return cachedDomains[cacheKey];
 };
 
+export const getMessagesForDomain = async (
+  domain: Domain
+): Promise<{ sends: CollectionEntry<CollectionMessageTypes>[]; receives: CollectionEntry<CollectionMessageTypes>[] }> => {
+  // We already have the services from the domain
+  const services = domain.data.services as unknown as CollectionEntry<'services'>[];
+
+  const events = await getCollection('events');
+  const commands = await getCollection('commands');
+  const queries = await getCollection('queries');
+
+  const allMessages = [...events, ...commands, ...queries];
+
+  const sends = services.flatMap((service) => service.data.sends || []);
+  const receives = services.flatMap((service) => service.data.receives || []);
+
+  const sendsMessages = sends.map((send) => getItemsFromCollectionByIdAndSemverOrLatest(allMessages, send.id, send.version));
+  const receivesMessages = receives.map((receive) =>
+    getItemsFromCollectionByIdAndSemverOrLatest(allMessages, receive.id, receive.version)
+  );
+
+  return {
+    sends: sendsMessages.flat(),
+    receives: receivesMessages.flat(),
+  };
+};
+
 export const getUbiquitousLanguage = async (domain: Domain): Promise<UbiquitousLanguage[]> => {
   const ubiquitousLanguages = await getCollection('ubiquitousLanguages', (ubiquitousLanguage: UbiquitousLanguage) => {
     return ubiquitousLanguage.slug.startsWith(`${domain.collection}/${domain.slug}`);

package/eventcatalog/src/utils/users.ts

@@ -32,8 +32,8 @@ export const getUsers = async (): Promise<User[]> => {
     });
 
     const isOwnedByUserOrAssociatedTeam = (item: CollectionEntry<CollectionTypes>) => {
-      const associatedTeamsSlug: string[] = associatedTeams.map((team) => team.slug);
-      return item.data.owners?.some((owner) => owner.id === user.data.id || associatedTeamsSlug.includes(owner.id));
+      const associatedTeamsId: string[] = associatedTeams.map((team) => team.data.id);
+      return item.data.owners?.some((owner) => owner.id === user.data.id || associatedTeamsId.includes(owner.id));
     };
 
     const ownedServices = services.filter(isOwnedByUserOrAssociatedTeam);

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.25.1",
+  "version": "2.26.1",
   "publishConfig": {
     "access": "public"
   },

package/default-files-for-collections/teams.md

@@ -1,11 +0,0 @@
----
-id: dboyne
-name: David Boyne
-avatarUrl: "https://pbs.twimg.com/profile_images/1262283153563140096/DYRDqKg6_400x400.png"
-role: Lead developer
-email: test@test.com
-hidden: true
-slackDirectMessageUrl: https://yourteam.slack.com/channels/boyney123
----
-
-<!-- Do not delete this file, required for EC, you an ignore this file -->

package/default-files-for-collections/users.md

@@ -1,11 +0,0 @@
----
-id: dboyne
-name: David Boyne
-avatarUrl: "https://pbs.twimg.com/profile_images/1262283153563140096/DYRDqKg6_400x400.png"
-role: Lead developer
-email: test@test.com
-hidden: true
-slackDirectMessageUrl: https://yourteam.slack.com/channels/boyney123
----
-
-<!-- Do not delete this file, required for EC, you an ignore this file -->