Skip to content

API Handle Null Values in DKIM and SPF Failure Tables #2828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nsdeschenes merged 2 commits into from
Aug 12, 2021
Merged

API Handle Null Values in DKIM and SPF Failure Tables #2828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52679dd
update dkim failure table guidanceTag to handle null values
nsdeschenes Aug 12, 2021
1bb6f5e
update spf failure table guidanceTag field to support null values
nsdeschenes Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 57 additions & 34 deletions api-js/src/dmarc-summaries/objects/__tests__/dkim-failure-table.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,42 +159,65 @@ describe('given the dkimFailureTable gql object', () => {
})
})
describe('testing the guidanceTag resolver', () => {
it('returns resolved value', async () => {
const demoType = dkimFailureTableType.getFields()

const expectedResults = {
_id: 'aggregateGuidanceTags/agg1',
_key: 'agg1',
_rev: 'rev',
_type: 'guidanceTag',
guidance: 'cool guidance for issue',
id: 'agg1',
refLinksGuide: [
{ description: 'Link Description', ref_link: 'www.link.ca' },
],
refLinksTechnical: [
{
description: 'Tech link description',
tech_link: 'www.tech.link.ca',
},
],
tagId: 'agg1',
tagName: 'cool-tag-name',
}

expect(
await demoType.guidanceTag.resolve(
{ guidance: 'agg1' },
{},
{
loaders: {
loadAggregateGuidanceTagByTagId: {
load: jest.fn().mockReturnValue(expectedResults),
describe('guidance is not null', () => {
it('returns resolved value', async () => {
const demoType = dkimFailureTableType.getFields()

const expectedResults = {
_id: 'aggregateGuidanceTags/agg1',
_key: 'agg1',
_rev: 'rev',
_type: 'guidanceTag',
guidance: 'cool guidance for issue',
id: 'agg1',
refLinksGuide: [
{ description: 'Link Description', ref_link: 'www.link.ca' },
],
refLinksTechnical: [
{
description: 'Tech link description',
tech_link: 'www.tech.link.ca',
},
],
tagId: 'agg1',
tagName: 'cool-tag-name',
}

expect(
await demoType.guidanceTag.resolve(
{ guidance: 'agg1' },
{},
{
loaders: {
loadAggregateGuidanceTagByTagId: {
load: jest.fn().mockReturnValue(expectedResults),
},
},
},
),
).toEqual(expectedResults)
})
})
describe('guidance is null', () => {
it('returns an empty obj', async () => {
const demoType = dkimFailureTableType.getFields()

const expectedResults = {}

expect(
await demoType.guidanceTag.resolve(
{ guidance: null },
{},
{
loaders: {
loadAggregateGuidanceTagByTagId: {
load: jest.fn().mockReturnValue(expectedResults),
},
},
},
},
),
).toEqual(expectedResults)
),
).toEqual(expectedResults)
})
})
})
describe('testing the headerFrom resolver', () => {
Expand Down
91 changes: 57 additions & 34 deletions api-js/src/dmarc-summaries/objects/__tests__/spf-failure-table.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,42 +117,65 @@ describe('given spfFailureTable gql object', () => {
})
})
describe('testing the guidanceTag resolver', () => {
it('returns resolved value', async () => {
const demoType = spfFailureTableType.getFields()

const expectedResult = {
_id: 'aggregateGuidanceTags/agg1',
_key: 'agg1',
_rev: 'rev',
_type: 'guidanceTag',
guidance: 'cool guidance for issue',
id: 'agg1',
refLinksGuide: [
{ description: 'Link Description', ref_link: 'www.link.ca' },
],
refLinksTechnical: [
{
description: 'Tech link description',
tech_link: 'www.tech.link.ca',
},
],
tagId: 'agg1',
tagName: 'cool-tag-name',
}

expect(
await demoType.guidanceTag.resolve(
{ guidance: 'agg1' },
{},
{
loaders: {
loadAggregateGuidanceTagByTagId: {
load: jest.fn().mockReturnValue(expectedResult),
describe('guidance is not null', () => {
it('returns resolved value', async () => {
const demoType = spfFailureTableType.getFields()

const expectedResult = {
_id: 'aggregateGuidanceTags/agg1',
_key: 'agg1',
_rev: 'rev',
_type: 'guidanceTag',
guidance: 'cool guidance for issue',
id: 'agg1',
refLinksGuide: [
{ description: 'Link Description', ref_link: 'www.link.ca' },
],
refLinksTechnical: [
{
description: 'Tech link description',
tech_link: 'www.tech.link.ca',
},
],
tagId: 'agg1',
tagName: 'cool-tag-name',
}

expect(
await demoType.guidanceTag.resolve(
{ guidance: 'agg1' },
{},
{
loaders: {
loadAggregateGuidanceTagByTagId: {
load: jest.fn().mockReturnValue(expectedResult),
},
},
},
),
).toEqual(expectedResult)
})
})
describe('guidance is null', () => {
it('returns an empty obj', async () => {
const demoType = spfFailureTableType.getFields()

const expectedResult = {}

expect(
await demoType.guidanceTag.resolve(
{ guidance: null },
{},
{
loaders: {
loadAggregateGuidanceTagByTagId: {
load: jest.fn().mockReturnValue(expectedResult),
},
},
},
},
),
).toEqual(expectedResult)
),
).toEqual(expectedResult)
})
})
})
describe('testing the headerFrom resolver', () => {
Expand Down
7 changes: 6 additions & 1 deletion api-js/src/dmarc-summaries/objects/dkim-failure-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,12 @@ export const dkimFailureTableType = new GraphQLObjectType({
{ guidance },
_args,
{ loaders: { loadAggregateGuidanceTagByTagId } },
) => await loadAggregateGuidanceTagByTagId.load(guidance),
) => {
if (guidance) {
return await loadAggregateGuidanceTagByTagId.load(guidance)
}
return {}
},
},
headerFrom: {
type: GraphQLString,
Expand Down
7 changes: 6 additions & 1 deletion api-js/src/dmarc-summaries/objects/spf-failure-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ export const spfFailureTableType = new GraphQLObjectType({
{ guidance },
_args,
{ loaders: { loadAggregateGuidanceTagByTagId } },
) => await loadAggregateGuidanceTagByTagId.load(guidance),
) => {
if (guidance) {
return await loadAggregateGuidanceTagByTagId.load(guidance)
}
return {}
},
},
headerFrom: {
type: GraphQLString,
Expand Down