From 088adc03707dc45622844ba9ffbd471a954a8937 Mon Sep 17 00:00:00 2001 From: Tanner Fleming Date: Wed, 1 Apr 2026 15:35:32 +0000 Subject: [PATCH 1/3] fix: data not returning from api-journeys to journeys modern --- .../src/app/modules/journey/journey.resolver.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/apis/api-journeys/src/app/modules/journey/journey.resolver.ts b/apis/api-journeys/src/app/modules/journey/journey.resolver.ts index fc4382ce222..74ddf42ce7e 100644 --- a/apis/api-journeys/src/app/modules/journey/journey.resolver.ts +++ b/apis/api-journeys/src/app/modules/journey/journey.resolver.ts @@ -1272,4 +1272,17 @@ export class JourneyResolver { where: { journeyId: journey.id } }) } + + @ResolveField('journeyCustomizationDescription') + async journeyCustomizationDescription( + @Parent() journey: Journey + ): Promise { + const journeyWithCustomizationDescription = + await this.prismaService.journey.findUnique({ + where: { id: journey.id }, + select: { journeyCustomizationDescription: true } + }) + + return journeyWithCustomizationDescription?.journeyCustomizationDescription ?? null + } } From ee4ddae83aefc4d741d5a21899a455738967a8f9 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2026 15:51:45 +0000 Subject: [PATCH 2/3] fix: lint issues --- .../api-journeys/src/app/modules/journey/journey.resolver.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apis/api-journeys/src/app/modules/journey/journey.resolver.ts b/apis/api-journeys/src/app/modules/journey/journey.resolver.ts index 74ddf42ce7e..8666e338e4c 100644 --- a/apis/api-journeys/src/app/modules/journey/journey.resolver.ts +++ b/apis/api-journeys/src/app/modules/journey/journey.resolver.ts @@ -1283,6 +1283,9 @@ export class JourneyResolver { select: { journeyCustomizationDescription: true } }) - return journeyWithCustomizationDescription?.journeyCustomizationDescription ?? null + return ( + journeyWithCustomizationDescription?.journeyCustomizationDescription ?? + null + ) } } From abc096e24c889d6ae58520cc99d98bc5114808b7 Mon Sep 17 00:00:00 2001 From: Tanner Fleming Date: Wed, 1 Apr 2026 17:15:55 +0000 Subject: [PATCH 3/3] fix: prevent deleted fields from overiding --- .../src/app/modules/journey/journey.resolver.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apis/api-journeys/src/app/modules/journey/journey.resolver.ts b/apis/api-journeys/src/app/modules/journey/journey.resolver.ts index 8666e338e4c..15c2cd12176 100644 --- a/apis/api-journeys/src/app/modules/journey/journey.resolver.ts +++ b/apis/api-journeys/src/app/modules/journey/journey.resolver.ts @@ -1277,9 +1277,13 @@ export class JourneyResolver { async journeyCustomizationDescription( @Parent() journey: Journey ): Promise { + if (journey.journeyCustomizationDescription !== undefined) { + return journey.journeyCustomizationDescription + } + const journeyWithCustomizationDescription = - await this.prismaService.journey.findUnique({ - where: { id: journey.id }, + await this.prismaService.journey.findFirst({ + where: { id: journey.id, deletedAt: null }, select: { journeyCustomizationDescription: true } })