diff --git a/api-js/src/auth/__tests__/user-required.test.js b/api-js/src/auth/__tests__/user-required.test.js index 788faefcbe..62b4915e1c 100644 --- a/api-js/src/auth/__tests__/user-required.test.js +++ b/api-js/src/auth/__tests__/user-required.test.js @@ -46,7 +46,7 @@ describe('given a userLoaderByKey dataloader', () => { const expectedCursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const expectedUser = await expectedCursor.next() diff --git a/api-js/src/loaders/chart-summaries/__tests__/load-chart-summary-by-key.test.js b/api-js/src/loaders/chart-summaries/__tests__/load-chart-summary-by-key.test.js index 4ef02773da..f858277356 100644 --- a/api-js/src/loaders/chart-summaries/__tests__/load-chart-summary-by-key.test.js +++ b/api-js/src/loaders/chart-summaries/__tests__/load-chart-summary-by-key.test.js @@ -58,7 +58,7 @@ describe('given the chartSummaryLoaderByKey function', () => { const expectedCursor = await query` FOR summary IN chartSummaries FILTER summary._key == "web" - RETURN summary + RETURN MERGE({ id: summary._key }, summary) ` const expectedSummary = await expectedCursor.next() @@ -74,7 +74,7 @@ describe('given the chartSummaryLoaderByKey function', () => { const expectedSummaries = [] const expectedCursor = await query` FOR summary IN chartSummaries - RETURN summary + RETURN MERGE({ id: summary._key }, summary) ` while (expectedCursor.hasNext()) { diff --git a/api-js/src/loaders/chart-summaries/load-chart-summary-by-key.js b/api-js/src/loaders/chart-summaries/load-chart-summary-by-key.js index 51c072b1fd..90d550dd54 100644 --- a/api-js/src/loaders/chart-summaries/load-chart-summary-by-key.js +++ b/api-js/src/loaders/chart-summaries/load-chart-summary-by-key.js @@ -9,7 +9,7 @@ module.exports.chartSummaryLoaderByKey = (query, userId, i18n) => cursor = await query` FOR summary IN chartSummaries FILTER summary._key IN ${keys} - RETURN summary + RETURN MERGE({ id: summary._key }, summary) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/domains/__tests__/load-domain-by-domain.test.js b/api-js/src/loaders/domains/__tests__/load-domain-by-domain.test.js index 881674f7b6..f3f69fa399 100644 --- a/api-js/src/loaders/domains/__tests__/load-domain-by-domain.test.js +++ b/api-js/src/loaders/domains/__tests__/load-domain-by-domain.test.js @@ -42,7 +42,7 @@ describe('given a domainLoaderByDomain dataloader', () => { const expectedCursor = await query` FOR domain IN domains FILTER domain.domain == "test.canada.ca" - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` const expectedDomain = await expectedCursor.next() @@ -58,7 +58,7 @@ describe('given a domainLoaderByDomain dataloader', () => { const expectedDomains = [] const expectedCursor = await query` FOR domain IN domains - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` while (expectedCursor.hasNext()) { @@ -89,7 +89,7 @@ describe('given a domainLoaderByDomain dataloader', () => { const expectedCursor = await query` FOR domain IN domains FILTER domain.domain == "test.canada.ca" - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` const expectedDomain = await expectedCursor.next() @@ -116,7 +116,7 @@ describe('given a domainLoaderByDomain dataloader', () => { const expectedCursor = await query` FOR domain IN domains FILTER domain.domain == "test.canada.ca" - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` const expectedDomain = await expectedCursor.next() @@ -159,7 +159,7 @@ describe('given a domainLoaderByDomain dataloader', () => { const expectedCursor = await query` FOR domain IN domains FILTER domain.domain == "test.canada.ca" - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` const expectedDomain = await expectedCursor.next() @@ -184,7 +184,7 @@ describe('given a domainLoaderByDomain dataloader', () => { const expectedCursor = await query` FOR domain IN domains FILTER domain.domain == "test.canada.ca" - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` const expectedDomain = await expectedCursor.next() diff --git a/api-js/src/loaders/domains/__tests__/load-domain-by-key.test.js b/api-js/src/loaders/domains/__tests__/load-domain-by-key.test.js index dc047ac629..16fab21629 100644 --- a/api-js/src/loaders/domains/__tests__/load-domain-by-key.test.js +++ b/api-js/src/loaders/domains/__tests__/load-domain-by-key.test.js @@ -44,7 +44,7 @@ describe('given a domainLoaderByKey dataloader', () => { const expectedCursor = await query` FOR domain IN domains FILTER domain.domain == "test.canada.ca" - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` const expectedDomain = await expectedCursor.next() @@ -60,7 +60,7 @@ describe('given a domainLoaderByKey dataloader', () => { const expectedDomains = [] const expectedCursor = await query` FOR domain IN domains - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` while (expectedCursor.hasNext()) { @@ -91,7 +91,7 @@ describe('given a domainLoaderByKey dataloader', () => { const expectedCursor = await query` FOR domain IN domains FILTER domain.domain == "test.canada.ca" - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` const expectedDomain = await expectedCursor.next() @@ -118,7 +118,7 @@ describe('given a domainLoaderByKey dataloader', () => { const expectedCursor = await query` FOR domain IN domains FILTER domain.domain == "test.canada.ca" - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` const expectedDomain = await expectedCursor.next() @@ -161,7 +161,7 @@ describe('given a domainLoaderByKey dataloader', () => { const expectedCursor = await query` FOR domain IN domains FILTER domain.domain == "test.canada.ca" - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` const expectedDomain = await expectedCursor.next() @@ -186,7 +186,7 @@ describe('given a domainLoaderByKey dataloader', () => { const expectedCursor = await query` FOR domain IN domains FILTER domain.domain == "test.canada.ca" - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` const expectedDomain = await expectedCursor.next() diff --git a/api-js/src/loaders/domains/load-domain-by-domain.js b/api-js/src/loaders/domains/load-domain-by-domain.js index eaeec3ad6b..29e4b367ed 100644 --- a/api-js/src/loaders/domains/load-domain-by-domain.js +++ b/api-js/src/loaders/domains/load-domain-by-domain.js @@ -9,7 +9,7 @@ module.exports.domainLoaderByDomain = (query, userId, i18n) => cursor = await query` FOR domain IN domains FILTER domain.domain IN ${domains} - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/domains/load-domain-by-key.js b/api-js/src/loaders/domains/load-domain-by-key.js index b2773b91ae..6f4aed8125 100644 --- a/api-js/src/loaders/domains/load-domain-by-key.js +++ b/api-js/src/loaders/domains/load-domain-by-key.js @@ -9,7 +9,7 @@ module.exports.domainLoaderByKey = (query, userId, i18n) => cursor = await query` FOR domain IN domains FILTER domain._key IN ${ids} - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/domains/load-domain-connections-by-organizations-id.js b/api-js/src/loaders/domains/load-domain-connections-by-organizations-id.js index 1bd3fc422f..cba5860443 100644 --- a/api-js/src/loaders/domains/load-domain-connections-by-organizations-id.js +++ b/api-js/src/loaders/domains/load-domain-connections-by-organizations-id.js @@ -109,7 +109,7 @@ const domainLoaderConnectionsByOrgId = ( ${afterTemplate} ${beforeTemplate} ${limitTemplate} - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ) LET hasNextPage = (LENGTH( @@ -168,7 +168,6 @@ const domainLoaderConnectionsByOrgId = ( } const edges = domainsInfo.domains.map((domain) => { - domain.id = domain._key return { cursor: toGlobalId('domains', domain._key), node: domain, diff --git a/api-js/src/loaders/domains/load-domain-connections-by-user-id.js b/api-js/src/loaders/domains/load-domain-connections-by-user-id.js index 0aa663a2ea..226581e0a4 100644 --- a/api-js/src/loaders/domains/load-domain-connections-by-user-id.js +++ b/api-js/src/loaders/domains/load-domain-connections-by-user-id.js @@ -104,7 +104,7 @@ const domainLoaderConnectionsByUserId = ( ${afterTemplate} ${beforeTemplate} ${limitTemplate} - RETURN domain + RETURN MERGE({ id: domain._key}, domain) ) LET hasNextPage = (LENGTH( @@ -163,7 +163,6 @@ const domainLoaderConnectionsByUserId = ( } const edges = domainsInfo.domains.map((domain) => { - domain.id = domain._key return { cursor: toGlobalId('domains', domain._key), node: domain, diff --git a/api-js/src/loaders/email-scan/__tests__/load-dkim-by-key.test.js b/api-js/src/loaders/email-scan/__tests__/load-dkim-by-key.test.js index 4e109c5d9b..e4ca7b3674 100644 --- a/api-js/src/loaders/email-scan/__tests__/load-dkim-by-key.test.js +++ b/api-js/src/loaders/email-scan/__tests__/load-dkim-by-key.test.js @@ -49,7 +49,7 @@ describe('given the dkimLoaderByKey function', () => { const expectedCursor = await query` FOR dkimScan IN dkim SORT dkimScan._key ASC LIMIT 1 - RETURN dkimScan + RETURN MERGE({ id: dkimScan._key}, dkimScan) ` const expectedDkim = await expectedCursor.next() @@ -65,7 +65,7 @@ describe('given the dkimLoaderByKey function', () => { const expectedDkimScans = [] const expectedCursor = await query` FOR dkimScan IN dkim - RETURN dkimScan + RETURN MERGE({ id: dkimScan._key}, dkimScan) ` while (expectedCursor.hasNext()) { diff --git a/api-js/src/loaders/email-scan/__tests__/load-dkim-result-by-key.test.js b/api-js/src/loaders/email-scan/__tests__/load-dkim-result-by-key.test.js index 8447e493a3..f472562513 100644 --- a/api-js/src/loaders/email-scan/__tests__/load-dkim-result-by-key.test.js +++ b/api-js/src/loaders/email-scan/__tests__/load-dkim-result-by-key.test.js @@ -49,7 +49,7 @@ describe('given the dkimResultLoaderByKey function', () => { const expectedCursor = await query` FOR dkimResult IN dkimResults SORT dkimResult._key ASC LIMIT 1 - RETURN dkimResult + RETURN MERGE({ id: dkimResult._key }, dkimResult) ` const expectedDkimResult = await expectedCursor.next() @@ -65,7 +65,7 @@ describe('given the dkimResultLoaderByKey function', () => { const expectedDkimResults = [] const expectedCursor = await query` FOR dkimResult IN dkimResults - RETURN dkimResult + RETURN MERGE({ id: dkimResult._key }, dkimResult) ` while (expectedCursor.hasNext()) { diff --git a/api-js/src/loaders/email-scan/__tests__/load-dmarc-by-key.test.js b/api-js/src/loaders/email-scan/__tests__/load-dmarc-by-key.test.js index 22ac1c92c8..4758c93594 100644 --- a/api-js/src/loaders/email-scan/__tests__/load-dmarc-by-key.test.js +++ b/api-js/src/loaders/email-scan/__tests__/load-dmarc-by-key.test.js @@ -47,7 +47,7 @@ describe('given the dmarcLoaderByKey function', () => { const expectedCursor = await query` FOR dmarcScan IN dmarc SORT dmarcScan._key ASC LIMIT 1 - RETURN dmarcScan + RETURN MERGE({ id: dmarcScan._key }, dmarcScan) ` const expectedDmarc = await expectedCursor.next() @@ -63,7 +63,7 @@ describe('given the dmarcLoaderByKey function', () => { const expectedDkimScans = [] const expectedCursor = await query` FOR dmarcScan IN dmarc - RETURN dmarcScan + RETURN MERGE({ id: dmarcScan._key }, dmarcScan) ` while (expectedCursor.hasNext()) { diff --git a/api-js/src/loaders/email-scan/__tests__/load-spf-by-key.test.js b/api-js/src/loaders/email-scan/__tests__/load-spf-by-key.test.js index 02dfee502c..08cdecb65b 100644 --- a/api-js/src/loaders/email-scan/__tests__/load-spf-by-key.test.js +++ b/api-js/src/loaders/email-scan/__tests__/load-spf-by-key.test.js @@ -48,7 +48,7 @@ describe('given the spfLoaderByKey function', () => { const expectedCursor = await query` FOR spfScan IN spf SORT spfScan._key ASC LIMIT 1 - RETURN spfScan + RETURN MERGE({ id: spfScan._key }, spfScan) ` const expectedSpf = await expectedCursor.next() @@ -64,7 +64,7 @@ describe('given the spfLoaderByKey function', () => { const expectedSpfScans = [] const expectedCursor = await query` FOR spfScan IN spf - RETURN spfScan + RETURN MERGE({ id: spfScan._key }, spfScan) ` while (expectedCursor.hasNext()) { diff --git a/api-js/src/loaders/email-scan/load-dkim-by-key.js b/api-js/src/loaders/email-scan/load-dkim-by-key.js index 8c3aa504fd..90c9fcab3c 100644 --- a/api-js/src/loaders/email-scan/load-dkim-by-key.js +++ b/api-js/src/loaders/email-scan/load-dkim-by-key.js @@ -9,7 +9,7 @@ module.exports.dkimLoaderByKey = (query, userId, i18n) => cursor = await query` FOR dkimScan IN dkim FILTER dkimScan._key IN ${keys} - RETURN dkimScan + RETURN MERGE({ id: dkimScan._key}, dkimScan) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/email-scan/load-dkim-connections-by-domain-id.js b/api-js/src/loaders/email-scan/load-dkim-connections-by-domain-id.js index 93eac265b4..1ac1c57af6 100644 --- a/api-js/src/loaders/email-scan/load-dkim-connections-by-domain-id.js +++ b/api-js/src/loaders/email-scan/load-dkim-connections-by-domain-id.js @@ -117,7 +117,7 @@ const dkimLoaderConnectionsByDomainId = ( ${startDateTemplate} ${endDateTemplate} ${limitTemplate} - RETURN dkimScan + RETURN MERGE({ id: dkimScan._key }, dkimScan) ) LET hasNextPage = (LENGTH( @@ -176,7 +176,6 @@ const dkimLoaderConnectionsByDomainId = ( } const edges = dkimScanInfo.dkimScans.map((dkimScan) => { - dkimScan.id = dkimScan._key dkimScan.domainId = domainId return { cursor: toGlobalId('dkim', dkimScan._key), diff --git a/api-js/src/loaders/email-scan/load-dkim-result-by-key.js b/api-js/src/loaders/email-scan/load-dkim-result-by-key.js index da86672077..aafb27b32a 100644 --- a/api-js/src/loaders/email-scan/load-dkim-result-by-key.js +++ b/api-js/src/loaders/email-scan/load-dkim-result-by-key.js @@ -9,7 +9,7 @@ module.exports.dkimResultLoaderByKey = (query, userId, i18n) => cursor = await query` FOR dkimResult IN dkimResults FILTER dkimResult._key IN ${keys} - RETURN dkimResult + RETURN MERGE({ id: dkimResult._key }, dkimResult) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/email-scan/load-dkim-results-connections-by-dkim-id.js b/api-js/src/loaders/email-scan/load-dkim-results-connections-by-dkim-id.js index 7a628a48fe..e8c19637c6 100644 --- a/api-js/src/loaders/email-scan/load-dkim-results-connections-by-dkim-id.js +++ b/api-js/src/loaders/email-scan/load-dkim-results-connections-by-dkim-id.js @@ -96,7 +96,7 @@ const dkimResultsLoaderConnectionByDkimId = ( ${afterTemplate} ${beforeTemplate} ${limitTemplate} - RETURN dkimResult + RETURN MERGE({ id: dkimResult._key }, dkimResult) ) LET hasNextPage = (LENGTH( @@ -155,7 +155,6 @@ const dkimResultsLoaderConnectionByDkimId = ( } const edges = dkimResultsInfo.dkimResults.map((dkimResult) => { - dkimResult.id = dkimResult._key dkimResult.dkimId = dkimId return { cursor: toGlobalId('dkimResult', dkimResult._key), diff --git a/api-js/src/loaders/email-scan/load-dmarc-by-key.js b/api-js/src/loaders/email-scan/load-dmarc-by-key.js index 4064a28421..e27d22e1b1 100644 --- a/api-js/src/loaders/email-scan/load-dmarc-by-key.js +++ b/api-js/src/loaders/email-scan/load-dmarc-by-key.js @@ -9,7 +9,7 @@ module.exports.dmarcLoaderByKey = (query, userId, i18n) => cursor = await query` FOR dmarcScan IN dmarc FILTER dmarcScan._key IN ${keys} - RETURN dmarcScan + RETURN MERGE({ id: dmarcScan._key }, dmarcScan) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/email-scan/load-dmarc-connections-by-domain-id.js b/api-js/src/loaders/email-scan/load-dmarc-connections-by-domain-id.js index d0ebe2ee18..bb06baf8c2 100644 --- a/api-js/src/loaders/email-scan/load-dmarc-connections-by-domain-id.js +++ b/api-js/src/loaders/email-scan/load-dmarc-connections-by-domain-id.js @@ -109,7 +109,7 @@ const dmarcLoaderConnectionsByDomainId = ( ${startDateTemplate} ${endDateTemplate} ${limitTemplate} - RETURN dmarcScan + RETURN MERGE({ id: dmarcScan._key }, dmarcScan) ) LET hasNextPage = (LENGTH( @@ -169,7 +169,6 @@ const dmarcLoaderConnectionsByDomainId = ( } const edges = dmarcScanInfo.dmarcScans.map((dmarcScan) => { - dmarcScan.id = dmarcScan._key dmarcScan.domainId = domainId return { cursor: toGlobalId('dmarc', dmarcScan._key), diff --git a/api-js/src/loaders/email-scan/load-spf-by-key.js b/api-js/src/loaders/email-scan/load-spf-by-key.js index 73cb94446d..79e2ecc25c 100644 --- a/api-js/src/loaders/email-scan/load-spf-by-key.js +++ b/api-js/src/loaders/email-scan/load-spf-by-key.js @@ -9,7 +9,7 @@ module.exports.spfLoaderByKey = (query, userId, i18n) => cursor = await query` FOR spfScan IN spf FILTER spfScan._key IN ${keys} - RETURN spfScan + RETURN MERGE({ id: spfScan._key }, spfScan) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/email-scan/load-spf-connections-by-domain-id.js b/api-js/src/loaders/email-scan/load-spf-connections-by-domain-id.js index 253f167682..e82aef52b3 100644 --- a/api-js/src/loaders/email-scan/load-spf-connections-by-domain-id.js +++ b/api-js/src/loaders/email-scan/load-spf-connections-by-domain-id.js @@ -108,7 +108,7 @@ const spfLoaderConnectionsByDomainId = ( ${startDateTemplate} ${endDateTemplate} ${limitTemplate} - RETURN spfScan + RETURN MERGE({ id: spfScan._key }, spfScan) ) LET hasNextPage = (LENGTH( @@ -167,7 +167,6 @@ const spfLoaderConnectionsByDomainId = ( } const edges = spfScanInfo.spfScans.map((spfScan) => { - spfScan.id = spfScan._key spfScan.domainId = domainId return { cursor: toGlobalId('spf', spfScan._key), diff --git a/api-js/src/loaders/organizations/__tests__/load-organization-by-key.test.js b/api-js/src/loaders/organizations/__tests__/load-organization-by-key.test.js index ef3b6599a6..944e18b1b7 100644 --- a/api-js/src/loaders/organizations/__tests__/load-organization-by-key.test.js +++ b/api-js/src/loaders/organizations/__tests__/load-organization-by-key.test.js @@ -123,7 +123,7 @@ describe('given a orgLoaderByKey dataloader', () => { FOR org IN organizations FILTER org.orgDetails.en.slug == "communications-security-establishment" LET domains = (FOR v, e IN 1..1 OUTBOUND org._id claims RETURN e._to) - RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("en", org.orgDetails)) + RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("en", org.orgDetails)) ` const expectedOrg = await expectedCursor.next() @@ -140,7 +140,7 @@ describe('given a orgLoaderByKey dataloader', () => { const expectedCursor = await query` FOR org IN organizations LET domains = (FOR v, e IN 1..1 OUTBOUND org._id claims RETURN e._to) - RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("en", org.orgDetails)) + RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("en", org.orgDetails)) ` while (expectedCursor.hasNext()) { @@ -217,7 +217,7 @@ describe('given a orgLoaderByKey dataloader', () => { FOR org IN organizations FILTER org.orgDetails.fr.slug == "centre-de-la-securite-des-telecommunications" LET domains = (FOR v, e IN 1..1 OUTBOUND org._id claims RETURN e._to) - RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("fr", org.orgDetails)) + RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("fr", org.orgDetails)) ` const expectedOrg = await expectedCursor.next() @@ -234,7 +234,7 @@ describe('given a orgLoaderByKey dataloader', () => { const expectedCursor = await query` FOR org IN organizations LET domains = (FOR v, e IN 1..1 OUTBOUND org._id claims RETURN e._to) - RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("fr", org.orgDetails)) + RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("fr", org.orgDetails)) ` while (expectedCursor.hasNext()) { diff --git a/api-js/src/loaders/organizations/__tests__/load-organization-by-slug.test.js b/api-js/src/loaders/organizations/__tests__/load-organization-by-slug.test.js index af9091d8fe..e4e257c6a0 100644 --- a/api-js/src/loaders/organizations/__tests__/load-organization-by-slug.test.js +++ b/api-js/src/loaders/organizations/__tests__/load-organization-by-slug.test.js @@ -111,7 +111,7 @@ describe('given a orgLoaderByKey dataloader', () => { FOR org IN organizations FILTER org.orgDetails.en.slug == "communications-security-establishment" LET domains = (FOR v, e IN 1..1 OUTBOUND org._id claims RETURN e._to) - RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("en", org.orgDetails)) + RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("en", org.orgDetails)) ` const expectedOrg = await expectedCursor.next() @@ -128,7 +128,7 @@ describe('given a orgLoaderByKey dataloader', () => { const expectedCursor = await query` FOR org IN organizations LET domains = (FOR v, e IN 1..1 OUTBOUND org._id claims RETURN e._to) - RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("en", org.orgDetails)) + RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("en", org.orgDetails)) ` while (expectedCursor.hasNext()) { @@ -205,7 +205,7 @@ describe('given a orgLoaderByKey dataloader', () => { FOR org IN organizations FILTER org.orgDetails.fr.slug == "centre-de-la-securite-des-telecommunications" LET domains = (FOR v, e IN 1..1 OUTBOUND org._id claims RETURN e._to) - RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("fr", org.orgDetails)) + RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("fr", org.orgDetails)) ` const expectedOrg = await expectedCursor.next() @@ -222,7 +222,7 @@ describe('given a orgLoaderByKey dataloader', () => { const expectedCursor = await query` FOR org IN organizations LET domains = (FOR v, e IN 1..1 OUTBOUND org._id claims RETURN e._to) - RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("fr", org.orgDetails)) + RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("fr", org.orgDetails)) ` while (expectedCursor.hasNext()) { diff --git a/api-js/src/loaders/organizations/load-organization-by-key.js b/api-js/src/loaders/organizations/load-organization-by-key.js index 77d1966d8f..6286d36f9e 100644 --- a/api-js/src/loaders/organizations/load-organization-by-key.js +++ b/api-js/src/loaders/organizations/load-organization-by-key.js @@ -10,7 +10,7 @@ module.exports.orgLoaderByKey = (query, language, userId, i18n) => FOR org IN organizations FILTER org._key IN ${ids} LET domains = (FOR v, e IN 1..1 OUTBOUND org._id claims RETURN e._to) - RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE(${language}, org.orgDetails)) + RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE(${language}, org.orgDetails)) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/organizations/load-organization-by-slug.js b/api-js/src/loaders/organizations/load-organization-by-slug.js index 74a6ad9d00..a209066703 100644 --- a/api-js/src/loaders/organizations/load-organization-by-slug.js +++ b/api-js/src/loaders/organizations/load-organization-by-slug.js @@ -10,7 +10,7 @@ module.exports.orgLoaderBySlug = (query, language, userId, i18n) => FOR org IN organizations FILTER TRANSLATE(${language}, org.orgDetails).slug IN ${slugs} LET domains = (FOR v, e IN 1..1 OUTBOUND org._id claims RETURN e._to) - RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE(${language}, org.orgDetails)) + RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE(${language}, org.orgDetails)) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/organizations/load-organization-connections-by-domain-id.js b/api-js/src/loaders/organizations/load-organization-connections-by-domain-id.js index ce533df266..f1e54210ee 100644 --- a/api-js/src/loaders/organizations/load-organization-connections-by-domain-id.js +++ b/api-js/src/loaders/organizations/load-organization-connections-by-domain-id.js @@ -106,7 +106,7 @@ const orgLoaderConnectionArgsByDomainId = ( ${beforeTemplate} ${limitTemplate} LET domains = (FOR v, e IN 1..1 OUTBOUND org._id claims RETURN e._to) - RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE(${language}, org.orgDetails)) + RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE(${language}, org.orgDetails)) ) LET hasNextPage = (LENGTH( @@ -165,7 +165,6 @@ const orgLoaderConnectionArgsByDomainId = ( } const edges = organizationInfo.organizations.map((organization) => { - organization.id = organization._key return { cursor: toGlobalId('organizations', organization._key), node: organization, diff --git a/api-js/src/loaders/organizations/load-organization-connections-by-user-id.js b/api-js/src/loaders/organizations/load-organization-connections-by-user-id.js index d64f01b986..93209b81bf 100644 --- a/api-js/src/loaders/organizations/load-organization-connections-by-user-id.js +++ b/api-js/src/loaders/organizations/load-organization-connections-by-user-id.js @@ -101,7 +101,7 @@ const orgLoaderConnectionsByUserId = ( ${beforeTemplate} ${limitTemplate} LET domains = (FOR v, e IN 1..1 OUTBOUND org._id claims RETURN e._to) - RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE(${language}, org.orgDetails)) + RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE(${language}, org.orgDetails)) ) LET hasNextPage = (LENGTH( @@ -160,7 +160,6 @@ const orgLoaderConnectionsByUserId = ( } const edges = organizationInfo.organizations.map((org) => { - org.id = org._key return { cursor: toGlobalId('organizations', org._key), node: org, diff --git a/api-js/src/loaders/user-affiliations/__tests__/load-user-affiliations-by-key.test.js b/api-js/src/loaders/user-affiliations/__tests__/load-user-affiliations-by-key.test.js index 7232e6b3f6..8cbebc12bd 100644 --- a/api-js/src/loaders/user-affiliations/__tests__/load-user-affiliations-by-key.test.js +++ b/api-js/src/loaders/user-affiliations/__tests__/load-user-affiliations-by-key.test.js @@ -124,7 +124,7 @@ describe('given a affiliationLoaderByKey dataloader', () => { FILTER affiliation._id == ${affOne._id} LET orgKey = PARSE_IDENTIFIER(affiliation._from).key LET userKey = PARSE_IDENTIFIER(affiliation._to).key - RETURN MERGE(affiliation, { orgKey: orgKey, userKey: userKey }) + RETURN MERGE(affiliation, { id: affiliation._key, orgKey: orgKey, userKey: userKey }) ` const expectedAffiliation = await expectedCursor.next() @@ -142,7 +142,7 @@ describe('given a affiliationLoaderByKey dataloader', () => { FOR affiliation IN affiliations LET orgKey = PARSE_IDENTIFIER(affiliation._from).key LET userKey = PARSE_IDENTIFIER(affiliation._to).key - RETURN MERGE(affiliation, { orgKey: orgKey, userKey: userKey }) + RETURN MERGE(affiliation, { id: affiliation._key, orgKey: orgKey, userKey: userKey }) ` while (expectedCursor.hasNext()) { @@ -163,7 +163,7 @@ describe('given a affiliationLoaderByKey dataloader', () => { FILTER affiliation._id == ${affOne._id} LET orgKey = PARSE_IDENTIFIER(affiliation._from).key LET userKey = PARSE_IDENTIFIER(affiliation._to).key - RETURN MERGE(affiliation, { orgKey: orgKey, userKey: userKey }) + RETURN MERGE(affiliation, { id: affiliation._key, orgKey: orgKey, userKey: userKey }) ` const expectedAffiliation = await expectedCursor.next() @@ -192,7 +192,7 @@ describe('given a affiliationLoaderByKey dataloader', () => { FILTER affiliation._id == ${affOne._id} LET orgKey = PARSE_IDENTIFIER(affiliation._from).key LET userKey = PARSE_IDENTIFIER(affiliation._to).key - RETURN MERGE(affiliation, { orgKey: orgKey, userKey: userKey }) + RETURN MERGE(affiliation, { id: affiliation._key, orgKey: orgKey, userKey: userKey }) ` const expectedAffiliation = await expectedCursor.next() @@ -238,7 +238,7 @@ describe('given a affiliationLoaderByKey dataloader', () => { FILTER affiliation._id == ${affOne._id} LET orgKey = PARSE_IDENTIFIER(affiliation._from).key LET userKey = PARSE_IDENTIFIER(affiliation._to).key - RETURN MERGE(affiliation, { orgKey: orgKey, userKey: userKey }) + RETURN MERGE(affiliation, { id: affiliation._key, orgKey: orgKey, userKey: userKey }) ` const expectedAffiliation = await expectedCursor.next() @@ -256,7 +256,7 @@ describe('given a affiliationLoaderByKey dataloader', () => { FOR affiliation IN affiliations LET orgKey = PARSE_IDENTIFIER(affiliation._from).key LET userKey = PARSE_IDENTIFIER(affiliation._to).key - RETURN MERGE(affiliation, { orgKey: orgKey, userKey: userKey }) + RETURN MERGE(affiliation, { id: affiliation._key, orgKey: orgKey, userKey: userKey }) ` while (expectedCursor.hasNext()) { @@ -277,7 +277,7 @@ describe('given a affiliationLoaderByKey dataloader', () => { FILTER affiliation._id == ${affOne._id} LET orgKey = PARSE_IDENTIFIER(affiliation._from).key LET userKey = PARSE_IDENTIFIER(affiliation._to).key - RETURN MERGE(affiliation, { orgKey: orgKey, userKey: userKey }) + RETURN MERGE(affiliation, { id: affiliation._key, orgKey: orgKey, userKey: userKey }) ` const expectedAffiliation = await expectedCursor.next() @@ -304,7 +304,7 @@ describe('given a affiliationLoaderByKey dataloader', () => { FILTER affiliation._id == ${affOne._id} LET orgKey = PARSE_IDENTIFIER(affiliation._from).key LET userKey = PARSE_IDENTIFIER(affiliation._to).key - RETURN MERGE(affiliation, { orgKey: orgKey, userKey: userKey }) + RETURN MERGE(affiliation, { id: affiliation._key, orgKey: orgKey, userKey: userKey }) ` const expectedAffiliation = await expectedCursor.next() diff --git a/api-js/src/loaders/user-affiliations/load-user-affiliations-by-key.js b/api-js/src/loaders/user-affiliations/load-user-affiliations-by-key.js index d2498cdd9d..83b64ea62e 100644 --- a/api-js/src/loaders/user-affiliations/load-user-affiliations-by-key.js +++ b/api-js/src/loaders/user-affiliations/load-user-affiliations-by-key.js @@ -11,7 +11,7 @@ module.exports.affiliationLoaderByKey = (query, userId, i18n) => FILTER affiliation._key IN ${ids} LET orgKey = PARSE_IDENTIFIER(affiliation._from).key LET userKey = PARSE_IDENTIFIER(affiliation._to).key - RETURN MERGE(affiliation, { orgKey: orgKey, userKey: userKey }) + RETURN MERGE(affiliation, { id: affiliation._key, orgKey: orgKey, userKey: userKey }) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/user-affiliations/load-user-affiliations-by-org-id.js b/api-js/src/loaders/user-affiliations/load-user-affiliations-by-org-id.js index 9cad7191da..152ee5c64b 100644 --- a/api-js/src/loaders/user-affiliations/load-user-affiliations-by-org-id.js +++ b/api-js/src/loaders/user-affiliations/load-user-affiliations-by-org-id.js @@ -102,7 +102,7 @@ const affiliationLoaderByOrgId = (query, userId, cleanseInput, i18n) => async ({ ${limitTemplate} LET orgKey = PARSE_IDENTIFIER(affiliation._from).key LET userKey = PARSE_IDENTIFIER(affiliation._to).key - RETURN MERGE(affiliation, { orgKey: orgKey, userKey: userKey }) + RETURN MERGE(affiliation, { id: affiliation._key, orgKey: orgKey, userKey: userKey }) ) LET hasNextPage = (LENGTH( @@ -161,7 +161,6 @@ const affiliationLoaderByOrgId = (query, userId, cleanseInput, i18n) => async ({ } const edges = filteredAffiliations.affiliations.map((affiliation) => { - affiliation.id = affiliation._key return { cursor: toGlobalId('affiliations', affiliation._key), node: affiliation, diff --git a/api-js/src/loaders/user-affiliations/load-user-affiliations-by-user-id.js b/api-js/src/loaders/user-affiliations/load-user-affiliations-by-user-id.js index 098cbad2b6..e3c58a3e9d 100644 --- a/api-js/src/loaders/user-affiliations/load-user-affiliations-by-user-id.js +++ b/api-js/src/loaders/user-affiliations/load-user-affiliations-by-user-id.js @@ -101,7 +101,7 @@ const affiliationLoaderByUserId = ( ${limitTemplate} LET orgKey = PARSE_IDENTIFIER(affiliation._from).key LET userKey = PARSE_IDENTIFIER(affiliation._to).key - RETURN MERGE(affiliation, { orgKey: orgKey, userKey: userKey }) + RETURN MERGE(affiliation, { id: affiliation._key, orgKey: orgKey, userKey: userKey }) ) LET hasNextPage = (LENGTH( @@ -160,7 +160,6 @@ const affiliationLoaderByUserId = ( } const edges = filteredAffiliations.affiliations.map((affiliation) => { - affiliation.id = affiliation._key return { cursor: toGlobalId('affiliations', affiliation._key), node: affiliation, diff --git a/api-js/src/loaders/user/__tests__/load-user-by-key.test.js b/api-js/src/loaders/user/__tests__/load-user-by-key.test.js index 30e6791fcf..efc06fb31c 100644 --- a/api-js/src/loaders/user/__tests__/load-user-by-key.test.js +++ b/api-js/src/loaders/user/__tests__/load-user-by-key.test.js @@ -59,7 +59,7 @@ describe('given a userLoaderByKey dataloader', () => { const expectedCursor = await query` FOR user IN users FILTER user.userName == "random@email.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const expectedUser = await expectedCursor.next() @@ -75,7 +75,7 @@ describe('given a userLoaderByKey dataloader', () => { const expectedUsers = [] const expectedCursor = await query` FOR user IN users - RETURN user + RETURN MERGE({ id: user._key }, user) ` while (expectedCursor.hasNext()) { @@ -106,7 +106,7 @@ describe('given a userLoaderByKey dataloader', () => { const expectedCursor = await query` FOR user IN users FILTER user.userName == "random@email.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const expectedUser = await expectedCursor.next() @@ -133,7 +133,7 @@ describe('given a userLoaderByKey dataloader', () => { const expectedCursor = await query` FOR user IN users FILTER user.userName == "random@email.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const expectedUser = await expectedCursor.next() @@ -176,7 +176,7 @@ describe('given a userLoaderByKey dataloader', () => { const expectedCursor = await query` FOR user IN users FILTER user.userName == "random@email.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const expectedUser = await expectedCursor.next() @@ -201,7 +201,7 @@ describe('given a userLoaderByKey dataloader', () => { const expectedCursor = await query` FOR user IN users FILTER user.userName == "random@email.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const expectedUser = await expectedCursor.next() diff --git a/api-js/src/loaders/user/__tests__/load-user-by-username.test.js b/api-js/src/loaders/user/__tests__/load-user-by-username.test.js index 94184c0bdd..79941a3e48 100644 --- a/api-js/src/loaders/user/__tests__/load-user-by-username.test.js +++ b/api-js/src/loaders/user/__tests__/load-user-by-username.test.js @@ -62,15 +62,10 @@ describe('given a userLoaderByUserName dataloader', () => { const cursor = await query` FOR user IN users FILTER user.userName == ${userName} - RETURN user + RETURN MERGE({ id: user._key }, user) ` const expectedUser = await cursor.next() - /* - doing the following causes errors because database connection closes before promise is resolved - expect(loader.load(userName)).resolves.toEqual(expectedUser) - so as a work around until more testing can be done is the way it has to be done - */ const user = await loader.load(userName) expect(user).toEqual(expectedUser) }) @@ -89,16 +84,11 @@ describe('given a userLoaderByUserName dataloader', () => { const cursor = await query` FOR user IN users FILTER user.userName == ${userNames[i]} - RETURN user + RETURN MERGE({ id: user._key }, user) ` expectedUsers.push(await cursor.next()) } - /* - doing the following causes errors because database connection closes before promise is resolved - expect(loader.loadMany(userNames)).resolves.toEqual(expectedUsers) - so as a work around until more testing can be done is the way it has to be done - */ const users = await loader.loadMany(userNames) expect(users).toEqual(expectedUsers) }) diff --git a/api-js/src/loaders/user/load-user-by-key.js b/api-js/src/loaders/user/load-user-by-key.js index f2bea9d867..8e8de05926 100644 --- a/api-js/src/loaders/user/load-user-by-key.js +++ b/api-js/src/loaders/user/load-user-by-key.js @@ -9,7 +9,7 @@ module.exports.userLoaderByKey = (query, userId, i18n) => cursor = await query` FOR user IN users FILTER user._key IN ${ids} - RETURN user + RETURN MERGE({ id: user._key }, user) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/user/load-user-by-username.js b/api-js/src/loaders/user/load-user-by-username.js index b7a306d3cd..a372d0345e 100644 --- a/api-js/src/loaders/user/load-user-by-username.js +++ b/api-js/src/loaders/user/load-user-by-username.js @@ -9,7 +9,7 @@ module.exports.userLoaderByUserName = (query, userId, i18n) => cursor = await query` FOR user IN users FILTER user.userName IN ${userNames} - RETURN user + RETURN MERGE({ id: user._key }, user) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/web-scan/__tests__/load-https-by-key.test.js b/api-js/src/loaders/web-scan/__tests__/load-https-by-key.test.js index f8d0e98322..3f9a022b85 100644 --- a/api-js/src/loaders/web-scan/__tests__/load-https-by-key.test.js +++ b/api-js/src/loaders/web-scan/__tests__/load-https-by-key.test.js @@ -47,7 +47,7 @@ describe('given the httpsLoaderByKey function', () => { const expectedCursor = await query` FOR httpsScan IN https SORT httpsScan._key ASC LIMIT 1 - RETURN httpsScan + RETURN MERGE({ id: httpsScan._key }, httpsScan) ` const expectedHttps = await expectedCursor.next() @@ -64,7 +64,7 @@ describe('given the httpsLoaderByKey function', () => { const expectedCursor = await query` FOR httpsScan IN https - RETURN httpsScan + RETURN MERGE({ id: httpsScan._key }, httpsScan) ` while (expectedCursor.hasNext()) { diff --git a/api-js/src/loaders/web-scan/__tests__/load-ssl-by-key.test.js b/api-js/src/loaders/web-scan/__tests__/load-ssl-by-key.test.js index 3c25c6c3d1..af74473e2e 100644 --- a/api-js/src/loaders/web-scan/__tests__/load-ssl-by-key.test.js +++ b/api-js/src/loaders/web-scan/__tests__/load-ssl-by-key.test.js @@ -47,7 +47,7 @@ describe('given the sslLoaderByKey function', () => { const expectedCursor = await query` FOR sslScan IN ssl SORT sslScan._key ASC LIMIT 1 - RETURN sslScan + RETURN MERGE({ id: sslScan._key }, sslScan) ` const expectedSsl = await expectedCursor.next() @@ -63,8 +63,8 @@ describe('given the sslLoaderByKey function', () => { const expectedSslScans = [] const expectedCursor = await query` - FOR sslScan IN ssl - RETURN sslScan + FOR sslScan IN ssl + RETURN MERGE({ id: sslScan._key }, sslScan) ` while (expectedCursor.hasNext()) { diff --git a/api-js/src/loaders/web-scan/load-https-by-key.js b/api-js/src/loaders/web-scan/load-https-by-key.js index f3660feca3..58164ab8f3 100644 --- a/api-js/src/loaders/web-scan/load-https-by-key.js +++ b/api-js/src/loaders/web-scan/load-https-by-key.js @@ -8,7 +8,7 @@ module.exports.httpsLoaderByKey = (query, userId, i18n) => cursor = await query` FOR httpsScan IN https FILTER httpsScan._key IN ${keys} - RETURN httpsScan + RETURN MERGE({ id: httpsScan._key }, httpsScan) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/web-scan/load-https-connections-by-domain-id.js b/api-js/src/loaders/web-scan/load-https-connections-by-domain-id.js index fda92c7c80..ac7f4892f1 100644 --- a/api-js/src/loaders/web-scan/load-https-connections-by-domain-id.js +++ b/api-js/src/loaders/web-scan/load-https-connections-by-domain-id.js @@ -108,7 +108,7 @@ const httpsLoaderConnectionsByDomainId = ( ${startDateTemplate} ${endDateTemplate} ${limitTemplate} - RETURN httpsScan + RETURN MERGE({ id: httpsScan._key }, httpsScan) ) LET hasNextPage = (LENGTH( @@ -167,7 +167,6 @@ const httpsLoaderConnectionsByDomainId = ( } const edges = httpsScanInfo.httpsScans.map((httpsScan) => { - httpsScan.id = httpsScan._key httpsScan.domainId = domainId return { cursor: toGlobalId('https', httpsScan._key), diff --git a/api-js/src/loaders/web-scan/load-ssl-by-key.js b/api-js/src/loaders/web-scan/load-ssl-by-key.js index 5e8aedc477..5bae24770f 100644 --- a/api-js/src/loaders/web-scan/load-ssl-by-key.js +++ b/api-js/src/loaders/web-scan/load-ssl-by-key.js @@ -8,7 +8,7 @@ module.exports.sslLoaderByKey = (query, userId, i18n) => cursor = await query` FOR sslScan IN ssl FILTER sslScan._key IN ${keys} - RETURN sslScan + RETURN MERGE({ id: sslScan._key }, sslScan) ` } catch (err) { console.error( diff --git a/api-js/src/loaders/web-scan/load-ssl-connections-by-domain-id.js b/api-js/src/loaders/web-scan/load-ssl-connections-by-domain-id.js index 56fb216eb0..3001d112ce 100644 --- a/api-js/src/loaders/web-scan/load-ssl-connections-by-domain-id.js +++ b/api-js/src/loaders/web-scan/load-ssl-connections-by-domain-id.js @@ -108,7 +108,7 @@ const sslLoaderConnectionsByDomainId = ( ${startDateTemplate} ${endDateTemplate} ${limitTemplate} - RETURN sslScan + RETURN MERGE({ id: sslScan._key }, sslScan) ) LET hasNextPage = (LENGTH( @@ -167,7 +167,6 @@ const sslLoaderConnectionsByDomainId = ( } const edges = await sslScansInfo.sslScans.map((sslScan) => { - sslScan.id = sslScan._key sslScan.domainId = domainId return { cursor: toGlobalId('ssl', sslScan._key), diff --git a/api-js/src/mutations/user-affiliations/__tests__/invite-user-to-org.test.js b/api-js/src/mutations/user-affiliations/__tests__/invite-user-to-org.test.js index d9e7814cbf..628d8d206b 100644 --- a/api-js/src/mutations/user-affiliations/__tests__/invite-user-to-org.test.js +++ b/api-js/src/mutations/user-affiliations/__tests__/invite-user-to-org.test.js @@ -22,7 +22,15 @@ const { const { DB_PASS: rootPass, DB_URL: url } = process.env describe('invite user to org', () => { - let query, drop, truncate, migrate, schema, collections, transaction, i18n, tokenize + let query, + drop, + truncate, + migrate, + schema, + collections, + transaction, + i18n, + tokenize beforeAll(async () => { // Create GQL Schema @@ -133,7 +141,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await userCursor.next() }) @@ -157,7 +165,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test@email.gc.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` secondaryUser = await userCursor.next() }) @@ -242,7 +250,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test@email.gc.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` secondaryUser = await userCursor.next() }) @@ -327,7 +335,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test@email.gc.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` secondaryUser = await userCursor.next() }) @@ -672,7 +680,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test@email.gc.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` secondaryUser = await userCursor.next() }) @@ -757,7 +765,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test@email.gc.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` secondaryUser = await userCursor.next() }) @@ -1009,7 +1017,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await userCursor.next() }) @@ -1080,7 +1088,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await userCursor.next() }) @@ -1173,7 +1181,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await userCursor.next() await collections.affiliations.save({ @@ -1271,7 +1279,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await userCursor.next() await collections.affiliations.save({ @@ -1370,7 +1378,7 @@ describe('invite user to org', () => { let userCursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await userCursor.next() await collections.affiliations.save({ @@ -1387,7 +1395,7 @@ describe('invite user to org', () => { userCursor = await query` FOR user IN users FILTER user.userName == "test@email.gc.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` secondaryUser = await userCursor.next() }) @@ -1570,7 +1578,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await userCursor.next() }) @@ -1594,7 +1602,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test@email.gc.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` secondaryUser = await userCursor.next() }) @@ -1678,7 +1686,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test@email.gc.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` secondaryUser = await userCursor.next() }) @@ -1762,7 +1770,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test@email.gc.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` secondaryUser = await userCursor.next() }) @@ -2105,7 +2113,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test@email.gc.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` secondaryUser = await userCursor.next() }) @@ -2189,7 +2197,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test@email.gc.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` secondaryUser = await userCursor.next() }) @@ -2438,7 +2446,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await userCursor.next() }) @@ -2505,7 +2513,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await userCursor.next() }) @@ -2596,7 +2604,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await userCursor.next() await collections.affiliations.save({ @@ -2692,7 +2700,7 @@ describe('invite user to org', () => { const userCursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await userCursor.next() await collections.affiliations.save({ @@ -2789,7 +2797,7 @@ describe('invite user to org', () => { let userCursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await userCursor.next() await collections.affiliations.save({ @@ -2806,7 +2814,7 @@ describe('invite user to org', () => { userCursor = await query` FOR user IN users FILTER user.userName == "test@email.gc.ca" - RETURN user + RETURN MERGE({ id: user._key }, user) ` secondaryUser = await userCursor.next() }) diff --git a/api-js/src/mutations/user/__tests__/send-email-verification.test.js b/api-js/src/mutations/user/__tests__/send-email-verification.test.js index edffaa685f..82e2b0c0fc 100644 --- a/api-js/src/mutations/user/__tests__/send-email-verification.test.js +++ b/api-js/src/mutations/user/__tests__/send-email-verification.test.js @@ -120,7 +120,7 @@ describe('user send password reset email', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() @@ -260,7 +260,7 @@ describe('user send password reset email', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() diff --git a/api-js/src/mutations/user/__tests__/send-password-reset.test.js b/api-js/src/mutations/user/__tests__/send-password-reset.test.js index 43dcbc9ac1..ea845e27d2 100644 --- a/api-js/src/mutations/user/__tests__/send-password-reset.test.js +++ b/api-js/src/mutations/user/__tests__/send-password-reset.test.js @@ -121,7 +121,7 @@ describe('user send password reset email', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() @@ -263,7 +263,7 @@ describe('user send password reset email', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() diff --git a/api-js/src/mutations/user/__tests__/send-phone-code.test.js b/api-js/src/mutations/user/__tests__/send-phone-code.test.js index 0e170dc273..771713d453 100644 --- a/api-js/src/mutations/user/__tests__/send-phone-code.test.js +++ b/api-js/src/mutations/user/__tests__/send-phone-code.test.js @@ -80,7 +80,7 @@ describe('user send password reset email', () => { let cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` let user = await cursor.next() @@ -127,7 +127,7 @@ describe('user send password reset email', () => { cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await cursor.next() @@ -243,7 +243,7 @@ describe('user send password reset email', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() const loaderById = userLoaderByKey(query) @@ -307,7 +307,7 @@ describe('user send password reset email', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() const loaderById = userLoaderByKey(query) @@ -387,7 +387,7 @@ describe('user send password reset email', () => { let cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` let user = await cursor.next() const response = await graphql( @@ -432,7 +432,7 @@ describe('user send password reset email', () => { cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await cursor.next() @@ -544,7 +544,7 @@ describe('user send password reset email', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() const loaderById = userLoaderByKey(query) @@ -605,7 +605,7 @@ describe('user send password reset email', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() const loaderById = userLoaderByKey(query) diff --git a/api-js/src/mutations/user/__tests__/sign-in.test.js b/api-js/src/mutations/user/__tests__/sign-in.test.js index 444cd6d10f..bfe97a22ce 100644 --- a/api-js/src/mutations/user/__tests__/sign-in.test.js +++ b/api-js/src/mutations/user/__tests__/sign-in.test.js @@ -105,7 +105,7 @@ describe('authenticate user account', () => { let cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` let user = await cursor.next() @@ -162,7 +162,7 @@ describe('authenticate user account', () => { cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await cursor.next() @@ -178,7 +178,7 @@ describe('authenticate user account', () => { let cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` let user = await cursor.next() @@ -235,7 +235,7 @@ describe('authenticate user account', () => { cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await cursor.next() @@ -252,7 +252,7 @@ describe('authenticate user account', () => { let cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` let user = await cursor.next() @@ -299,7 +299,7 @@ describe('authenticate user account', () => { cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await cursor.next() @@ -359,7 +359,7 @@ describe('authenticate user account', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() @@ -415,7 +415,7 @@ describe('authenticate user account', () => { let cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` let user = await cursor.next() @@ -462,7 +462,7 @@ describe('authenticate user account', () => { cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await cursor.next() @@ -474,7 +474,7 @@ describe('authenticate user account', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() @@ -534,7 +534,7 @@ describe('authenticate user account', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() @@ -593,7 +593,7 @@ describe('authenticate user account', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() @@ -658,7 +658,7 @@ describe('authenticate user account', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() @@ -739,7 +739,7 @@ describe('authenticate user account', () => { let cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` let user = await cursor.next() @@ -795,7 +795,7 @@ describe('authenticate user account', () => { cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await cursor.next() @@ -811,7 +811,7 @@ describe('authenticate user account', () => { let cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` let user = await cursor.next() @@ -867,7 +867,7 @@ describe('authenticate user account', () => { cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await cursor.next() @@ -884,7 +884,7 @@ describe('authenticate user account', () => { let cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` let user = await cursor.next() @@ -931,7 +931,7 @@ describe('authenticate user account', () => { cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await cursor.next() @@ -989,7 +989,7 @@ describe('authenticate user account', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() @@ -1043,7 +1043,7 @@ describe('authenticate user account', () => { let cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` let user = await cursor.next() @@ -1090,7 +1090,7 @@ describe('authenticate user account', () => { cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` user = await cursor.next() @@ -1102,7 +1102,7 @@ describe('authenticate user account', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() @@ -1158,7 +1158,7 @@ describe('authenticate user account', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() @@ -1215,7 +1215,7 @@ describe('authenticate user account', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next() @@ -1278,7 +1278,7 @@ describe('authenticate user account', () => { const cursor = await query` FOR user IN users FILTER user.userName == "test.account@istio.actually.exists" - RETURN user + RETURN MERGE({ id: user._key }, user) ` const user = await cursor.next()