Merge branch 'main' into next

This commit is contained in:
Andras Bacsai 2022-09-07 15:40:37 +00:00
commit ac72c19d22

View File

@ -173,16 +173,16 @@ export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): Promi
where: { id: application.id }, where: { id: application.id },
data: { updatedAt: new Date() } data: { updatedAt: new Date() }
}); });
if (application.connectedDatabase && pullmergeRequestAction === 'opened' || pullmergeRequestAction === 'reopened') { // if (application.connectedDatabase && pullmergeRequestAction === 'opened' || pullmergeRequestAction === 'reopened') {
// Coolify hosted database // // Coolify hosted database
if (application.connectedDatabase.databaseId) { // if (application.connectedDatabase.databaseId) {
const databaseId = application.connectedDatabase.databaseId; // const databaseId = application.connectedDatabase.databaseId;
const database = await prisma.database.findUnique({ where: { id: databaseId } }); // const database = await prisma.database.findUnique({ where: { id: databaseId } });
if (database) { // if (database) {
await createdBranchDatabase(database, application.connectedDatabase.hostedDatabaseDBName, pullmergeRequestId); // await createdBranchDatabase(database, application.connectedDatabase.hostedDatabaseDBName, pullmergeRequestId);
} // }
} // }
} // }
await prisma.build.create({ await prisma.build.create({
data: { data: {
id: buildId, id: buildId,