fix(striker-ui-api): exclude deleted fences, upses, manifests from manifest template

main
Tsu-ba-me 1 year ago
parent 27ab8f2900
commit fa70667711
  1. 5
      striker-ui-api/src/lib/request_handlers/manifest/getManifestTemplate.ts

@ -1,5 +1,7 @@
import { RequestHandler } from 'express'; import { RequestHandler } from 'express';
import { DELETED } from '../../consts';
import { getLocalHostName, query } from '../../accessModule'; import { getLocalHostName, query } from '../../accessModule';
import { import {
getHostNameDomain, getHostNameDomain,
@ -52,6 +54,7 @@ export const getManifestTemplate: RequestHandler = async (
fence_uuid, fence_uuid,
fence_name fence_name
FROM fences FROM fences
WHERE fence_arguments != '${DELETED}'
ORDER BY fence_name ORDER BY fence_name
) AS a ) AS a
FULL JOIN ( FULL JOIN (
@ -60,6 +63,7 @@ export const getManifestTemplate: RequestHandler = async (
ups_uuid, ups_uuid,
ups_name ups_name
FROM upses FROM upses
WHERE ups_ip_address != '${DELETED}'
ORDER BY ups_name ORDER BY ups_name
) AS b ON a.row_number = b.row_number ) AS b ON a.row_number = b.row_number
FULL JOIN ( FULL JOIN (
@ -69,6 +73,7 @@ export const getManifestTemplate: RequestHandler = async (
SUBSTRING(manifest_name, '([\\d]*)$') AS INTEGER SUBSTRING(manifest_name, '([\\d]*)$') AS INTEGER
) AS last_sequence ) AS last_sequence
FROM manifests FROM manifests
WHERE manifest_note != '${DELETED}'
ORDER BY manifest_name DESC ORDER BY manifest_name DESC
LIMIT 1 LIMIT 1
) AS c ON a.row_number = c.row_number;`, ) AS c ON a.row_number = c.row_number;`,

Loading…
Cancel
Save