@@ -34,7 +34,6 @@ import { sendAlertEmail } from "~/services/email.server";
34
34
import { logger } from "~/services/logger.server" ;
35
35
import { decryptSecret } from "~/services/secrets/secretStore.server" ;
36
36
import { commonWorker } from "~/v3/commonWorker.server" ;
37
- import { FINAL_ATTEMPT_STATUSES } from "~/v3/taskStatus" ;
38
37
import { BaseService } from "../baseService.server" ;
39
38
import { generateFriendlyId } from "~/v3/friendlyIdentifiers" ;
40
39
import { type ProjectAlertChannelType , type ProjectAlertType } from "@trigger.dev/database" ;
@@ -53,13 +52,6 @@ type FoundAlert = Prisma.Result<
53
52
} ;
54
53
} ;
55
54
environment : true ;
56
- taskRunAttempt : {
57
- include : {
58
- taskRun : true ;
59
- backgroundWorkerTask : true ;
60
- backgroundWorker : true ;
61
- } ;
62
- } ;
63
55
taskRun : {
64
56
include : {
65
57
lockedBy : true ;
@@ -78,13 +70,7 @@ type FoundAlert = Prisma.Result<
78
70
} ;
79
71
} ,
80
72
"findUniqueOrThrow"
81
- > & {
82
- failedAttempt ?: Prisma . Result <
83
- typeof prisma . taskRunAttempt ,
84
- { select : { output : true ; outputType : true ; error : true } } ,
85
- "findFirst"
86
- > ;
87
- } ;
73
+ > ;
88
74
89
75
class SkipRetryError extends Error { }
90
76
@@ -100,13 +86,6 @@ export class DeliverAlertService extends BaseService {
100
86
} ,
101
87
} ,
102
88
environment : true ,
103
- taskRunAttempt : {
104
- include : {
105
- taskRun : true ,
106
- backgroundWorkerTask : true ,
107
- backgroundWorker : true ,
108
- } ,
109
- } ,
110
89
taskRun : {
111
90
include : {
112
91
lockedBy : true ,
@@ -133,24 +112,6 @@ export class DeliverAlertService extends BaseService {
133
112
return ;
134
113
}
135
114
136
- if ( alert . taskRun ) {
137
- const finishedAttempt = await this . _prisma . taskRunAttempt . findFirst ( {
138
- select : {
139
- output : true ,
140
- outputType : true ,
141
- error : true ,
142
- } ,
143
- where : {
144
- status : { in : FINAL_ATTEMPT_STATUSES } ,
145
- taskRunId : alert . taskRun . id ,
146
- } ,
147
- orderBy : {
148
- createdAt : "desc" ,
149
- } ,
150
- } ) ;
151
- alert . failedAttempt = finishedAttempt ;
152
- }
153
-
154
115
try {
155
116
switch ( alert . channel . type ) {
156
117
case "EMAIL" : {
@@ -1014,18 +975,18 @@ export class DeliverAlertService extends BaseService {
1014
975
}
1015
976
1016
977
#getRunError( alert : FoundAlert ) : TaskRunError {
1017
- if ( alert . failedAttempt ) {
1018
- const res = TaskRunError . safeParse ( alert . failedAttempt . error ) ;
978
+ if ( alert . taskRun ) {
979
+ const res = TaskRunError . safeParse ( alert . taskRun . error ) ;
1019
980
1020
981
if ( ! res . success ) {
1021
982
logger . error ( "[DeliverAlert] Failed to parse task run error, sending with unknown error" , {
1022
983
issues : res . error . issues ,
1023
- taskAttemptError : alert . failedAttempt . error ,
984
+ taskRunError : alert . taskRun . error ,
1024
985
} ) ;
1025
986
1026
987
return {
1027
988
type : "CUSTOM_ERROR" ,
1028
- raw : JSON . stringify ( alert . failedAttempt . error ?? "Unknown error" ) ,
989
+ raw : JSON . stringify ( alert . taskRun . error ?? "Unknown error" ) ,
1029
990
} ;
1030
991
}
1031
992
@@ -1034,7 +995,7 @@ export class DeliverAlertService extends BaseService {
1034
995
1035
996
return {
1036
997
type : "CUSTOM_ERROR" ,
1037
- raw : "No error on attempt " ,
998
+ raw : "No error on run " ,
1038
999
} ;
1039
1000
}
1040
1001
0 commit comments