Skip to content

Commit d30575c

Browse files
committed
refactor: use andTee/orTee for cancel-path side effects
1 parent 1af895a commit d30575c

1 file changed

Lines changed: 9 additions & 15 deletions

File tree

apps/webapp/app/v3/services/deployment.server.ts

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -251,15 +251,12 @@ export class DeploymentService extends BaseService {
251251
return this.getDeployment(authenticatedEnv.id, friendlyId)
252252
.andThen(validateDeployment)
253253
.andThen(cancelDeployment)
254-
.andThen(({ deployment }) =>
255-
this.#recordCanceledTelemetry(deployment.id)
256-
.orElse((error) => {
257-
logger.error("Failed to record canceled deployment telemetry", { error });
258-
return okAsync(undefined);
259-
})
260-
.map(() => ({ deployment }))
254+
.andTee(({ deployment }) =>
255+
this.#recordCanceledTelemetry(deployment.id).orTee((error) => {
256+
logger.error("Failed to record canceled deployment telemetry", { error });
257+
})
261258
)
262-
.andThen(({ deployment }) =>
259+
.andTee(({ deployment }) =>
263260
this.appendToEventLog(deployment.environment.project, deployment, [
264261
{
265262
type: "finalized",
@@ -268,14 +265,11 @@ export class DeploymentService extends BaseService {
268265
message: data?.canceledReason ?? undefined,
269266
},
270267
},
271-
])
272-
.orElse((error) => {
273-
logger.error("Failed to append event to deployment event log", { error });
274-
return okAsync(deployment);
275-
})
276-
.map(() => deployment)
268+
]).orTee((error) => {
269+
logger.error("Failed to append event to deployment event log", { error });
270+
})
277271
)
278-
.andThen(deleteTimeout)
272+
.andThen(({ deployment }) => deleteTimeout(deployment))
279273
.map(() => undefined);
280274
}
281275

0 commit comments

Comments
 (0)