admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2024-01-29 (pull request #1229)

Browse Source 
IO-1532 resolve update logic issue for status timings.
This commit is contained in:
Patrick Fic
2024-01-29 17:06:19 +00:00
parent 4b70c89e54 cb4a6e8774
commit abbd2263ee
2 changed files with 82 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/graphql-client/queries.js
View File

@@ -1989,12 +1989,20 @@ exports.UPDATE_OLD_TRANSITION = `mutation UPDATE_OLD_TRANSITION($jobid: uuid!, $
}
}`;
exports.INSERT_NEW_TRANSITION = `mutation INSERT_NEW_TRANSITION($newTransition: transitions_insert_input!, $oldTransitionId: uuid, $duration: numeric) {
exports.INSERT_NEW_TRANSITION = (
includeOldTransition
) => `mutation INSERT_NEW_TRANSITION($newTransition: transitions_insert_input!, ${
includeOldTransition ? `$oldTransitionId: uuid!, $duration: numeric` : ""
}) {
insert_transitions_one(object: $newTransition) {
id
}
update_transitions(where: {id: {_eq: $oldTransitionId}}, _set: {duration: $duration}) {
${
includeOldTransition
? `update_transitions(where: {id: {_eq: $oldTransitionId}}, _set: {duration: $duration}) {
affected_rows
}`
: ""
}
}`;

15
server/job/job-status-transition.js
View File

@@ -29,7 +29,7 @@ async function StatusTransition(req, res) {
// (Timeline)
// Final status is exported, there is no end date as there is no further transition (has no end date)
try {
const {update_transitions} = await client.request(
const { update_transitions } = await client.request(
queries.UPDATE_OLD_TRANSITION,
{
jobid: jobid,
@@ -48,12 +48,18 @@ async function StatusTransition(req, res) {
: new Date(update_transitions.returning[0].end) -
new Date(update_transitions.returning[0].start);
const resp2 = await client.request(queries.INSERT_NEW_TRANSITION, {
const resp2 = await client.request(
queries.INSERT_NEW_TRANSITION(update_transitions.affected_rows > 0),
{
...(update_transitions.affected_rows > 0
? {
oldTransitionId:
update_transitions.affected_rows === 0
? null
: update_transitions.returning[0].id,
duration,
}
: {}),
newTransition: {
bodyshopid: bodyshopid,
jobid: jobid,
@@ -68,7 +74,10 @@ async function StatusTransition(req, res) {
value: value,
type: "status",
},
});
}
);
logger.log("job-transition-update-result", "DEBUG", null, jobid, resp2);
//Check to see if there is an existing status transition record.
//Query using Job ID, start is not null, end is null.