fix: Simplify list services

src/lib/database/services.ts

@@ -4,6 +4,20 @@ import cuid from 'cuid';
 import { generatePassword } from '.';
 import { prisma } from './common';
 
+export async function listServicesWithIncludes() {
+	return await prisma.service.findMany({
+		include: {
+			destinationDocker: true,
+			minio: true,
+			plausibleAnalytics: true,
+			vscodeserver: true,
+			wordpress: true,
+			ghost: true,
+			meiliSearch: true
+		},
+		orderBy: { createdAt: 'desc' }
+	});
+}
 export async function listServices(teamId: string): Promise<Service[]> {
 	if (teamId === '0') {
 		return await prisma.service.findMany({ include: { teams: true } });

src/lib/haproxy/configuration.ts

@@ -6,6 +6,7 @@ import crypto from 'crypto';
 import { checkContainer, checkHAProxy } from '.';
 import { asyncExecShell, getDomain, getEngine } from '$lib/common';
 import { supportedServiceTypesAndVersions } from '$lib/components/common';
+import { listServicesWithIncludes } from '$lib/database';
 
 const url = dev ? 'http://localhost:5555' : 'http://coolify-haproxy:5555';
 
@@ -208,17 +209,7 @@ export async function configureHAProxy(): Promise<void> {
 			}
 		}
 	}
-	const services = await db.prisma.service.findMany({
+	const services = await listServicesWithIncludes();
-		include: {
-			destinationDocker: true,
-			minio: true,
-			plausibleAnalytics: true,
-			vscodeserver: true,
-			wordpress: true,
-			ghost: true,
-			meiliSearch: true
-		}
-	});
 
 	for (const service of services) {
 		const { fqdn, id, type, destinationDocker, destinationDockerId, updatedAt } = service;

src/lib/letsencrypt/index.ts

@@ -7,6 +7,7 @@ import fs from 'fs/promises';
 import getPort, { portNumbers } from 'get-port';
 import { supportedServiceTypesAndVersions } from '$lib/components/common';
 import { promises as dns } from 'dns';
+import { listServicesWithIncludes } from '$lib/database';
 
 export async function letsEncrypt(domain: string, id?: string, isCoolify = false): Promise<void> {
 	try {
@@ -145,18 +146,7 @@ export async function generateSSLCerts(): Promise<void> {
 			console.log(`Error during generateSSLCerts with ${application.fqdn}: ${error}`);
 		}
 	}
-	const services = await db.prisma.service.findMany({
+	const services = await listServicesWithIncludes();
-		include: {
-			destinationDocker: true,
-			minio: true,
-			plausibleAnalytics: true,
-			vscodeserver: true,
-			wordpress: true,
-			ghost: true,
-			meiliSearch: true
-		},
-		orderBy: { createdAt: 'desc' }
-	});
 
 	for (const service of services) {
 		try {