changed getIdentifiers to more suitable name

This commit is contained in:
Elias Papanikitas
2024-03-06 10:49:27 +01:00
parent 8fa52c7c55
commit a93d4ab922
2 changed files with 7 additions and 8 deletions

10
app.js
View File

@@ -2,12 +2,12 @@ import { app, errorHandler, uuid } from "mu";
import fetch from "node-fetch";
import { CronJob } from "cron";
import {
getIdentifiers,
getAbbOrganizationInfo,
constructOvoStructure,
updateOvoNumberAndUri,
createNewKboOrg,
linkAbbOrgToKboOrg,
getKboIdentifiers,
getKboOrgnizationInfo,
updateKboOrg,
getAllAbbKboOrganizations,
} from "./lib/queries";
@@ -23,7 +23,7 @@ import { WEGWIJS_DATA_OBJECT_IDS } from "./wegwijObjectDataIds";
app.post("/sync-kbo-data/:kboStructuredIdUuid", async function (req, res) {
try {
const kboStructuredIdUuid = req.params.kboStructuredIdUuid;
const identifiers = await getIdentifiers(kboStructuredIdUuid);
const identifiers = await getAbbOrganizationInfo(kboStructuredIdUuid);
if (!identifiers?.kbo) {
return throwServerError(API_STATUS_CODES.STATUS_403, res);
@@ -41,7 +41,7 @@ app.post("/sync-kbo-data/:kboStructuredIdUuid", async function (req, res) {
// We got a match on the KBO, getting the associated OVO back
const wegwijsInfo = data[0]; // Wegwijs should only have only one entry per KBO
kboObject = getKboFields(wegwijsInfo);
const kboIdentifiers = await getKboIdentifiers(identifiers.adminUnit);
const kboIdentifiers = await getKboOrgnizationInfo(identifiers.adminUnit);
if (!kboIdentifiers && kboObject) {
await createKbo(kboObject, identifiers.kboId, identifiers.adminUnit);
@@ -193,7 +193,7 @@ async function healAbbWithWegWijsData() {
}
if (isUpdate(wegwijsKboOrg, kboIdentifierOP)) {
const kboIdentifiers = await getKboIdentifiers(kboIdentifierOP.abbOrg);
const kboIdentifiers = await getKboOrgnizationInfo(kboIdentifierOP.abbOrg);
updateKboOrg(wegwijsKboOrg, kboIdentifiers);
}
}

View File

@@ -1,7 +1,7 @@
import { uuid, sparqlEscapeUri, sparqlEscapeString } from "mu";
import { querySudo as query, updateSudo as update } from "@lblod/mu-auth-sudo";
export async function getIdentifiers(kboStructuredIdUuid) {
export async function getAbbOrganizationInfo(kboStructuredIdUuid) {
const queryStr = `
SELECT DISTINCT ?kbo ?kboId ?ovo ?kboStructuredId ?ovoStructuredId ?bestuurseenheid WHERE {
VALUES ?g {
@@ -48,13 +48,12 @@ export async function getIdentifiers(kboStructuredIdUuid) {
ovoStructuredId: binding.ovoStructuredId?.value,
kboId: binding.kboId?.value,
adminUnit: binding.bestuurseenheid.value,
kboUnit: binding.kboOrganisation?.value,
};
}
return null;
}
export async function getKboIdentifiers(administrativeUnit) {
export async function getKboOrgnizationInfo(administrativeUnit) {
const queryStr = `
SELECT DISTINCT ?kboUnit ?abbUnit ?changeTime ?contactPointUri ?addressUri WHERE {
VALUES ?g {