Skip to content
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

Jump to bottom

#54: Update availability percentage calculation for expansions #55

Merged
merged 7 commits into from
Apr 15, 2024
Merged

#54: Update availability percentage calculation for expansions #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
05228b0
#54: update tests to fail the current process
mohit-s96 Apr 12, 2024
c9599a7
#54: use numExpandedRecordsFetched for expanded items
mohit-s96 Apr 12, 2024
068efaa
#54: add optional chaining
mohit-s96 Apr 12, 2024
3019363
#54: update tests to fail
mohit-s96 Apr 15, 2024
aabc7a4
#54: change numExpandedRecordsFetched to numUniqueRecordsFetched
mohit-s96 Apr 15, 2024
06ad3bc
#54: update tests
mohit-s96 Apr 15, 2024
cd641c9
#54: add new param 'useNewReportFormat'
mohit-s96 Apr 15, 2024
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
12 changes: 7 additions & 5 deletions lib/process-data-availability.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ const getAvailabilityAggregatesByResourceTemplate = () => {
* @param {Object} availabilityReport the RESO availability report JSON to process.
* @returns a JSON availability report with the appropriate roll-ups and aggregates.
*/
const processDataAvailability = async availabilityReport => {
const processDataAvailability = async (availabilityReport, useNewReportFormat = true) => {
//iterate over each field and lookup and compute their availabilities
const { resources, fields, lookups, lookupValues, ...rest } = availabilityReport;

Expand All @@ -204,13 +204,15 @@ const processDataAvailability = async availabilityReport => {

const { resourceCounts, expandedResourcesCounts } = resources.reduce(
(acc, curr) => {
const { resourceName, numRecordsFetched, expansions } = curr;
acc.resourceCounts[resourceName] = numRecordsFetched;
const { resourceName, numRecordsFetched, expansions, numUniqueRecordsFetched } = curr;
const totalFetchedRecords = useNewReportFormat ? numUniqueRecordsFetched : numRecordsFetched;
acc.resourceCounts[resourceName] = totalFetchedRecords;
expansions?.forEach(expansion => {
const totalFetchedExpandedRecords = useNewReportFormat ? expansion.numUniqueRecordsFetched : expansion.numRecordsFetched;
if (!acc.expandedResourcesCounts[resourceName]) {
acc.expandedResourcesCounts[resourceName] = {};
}
acc.expandedResourcesCounts[resourceName][expansion.resourceName] = expansion.numRecordsFetched;
acc.expandedResourcesCounts[resourceName][expansion.resourceName] = totalFetchedExpandedRecords;
});
return acc;
},
Expand Down Expand Up @@ -380,7 +382,7 @@ const processDataAvailability = async availabilityReport => {
}

const lookupsForField = isExpansion
? lookupValueCache[parentResourceName].expansions?.[resourceName]?.[fieldName]
? lookupValueCache[parentResourceName]?.expansions?.[resourceName]?.[fieldName]
: lookupValueCache[resourceName]?.[fieldName];

//only process if there are lookups for this field
Expand Down
6 changes: 5 additions & 1 deletion test/sample-data-availability-reports/availability-report.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const daReport = {
resourceName: 'Office',
recordCount: 1000,
numRecordsFetched: 1000,
numUniqueRecordsFetched: 1000,
numSamples: 10,
pageSize: 100,
averageResponseBytes: 100000,
Expand All @@ -23,6 +24,7 @@ const daReport = {
resourceName: 'Property',
recordCount: 1000,
numRecordsFetched: 1000,
numUniqueRecordsFetched: 1000,
numSamples: 10,
pageSize: 100,
averageResponseBytes: 100000,
Expand All @@ -44,7 +46,9 @@ const daReport = {
dateField: 'ModificationTimestamp',
dateLow: '2021-03-15T10:12:32.319Z',
dateHigh: '2022-03-15T10:12:32.319Z',
keyFields: ['MemberKey']
keyFields: ['MemberKey'],
numExpandedRecordsFetched: 2000,
numUniqueRecordsFetched: 2000
}
]
}
Expand Down
44 changes: 24 additions & 20 deletions test/sample-data-availability-reports/expected-availability-report.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@
{
"resourceName": "Media",
"fieldName": "ListOfficeKey",
"availability": 1,
"availability": 0.5,
"parentResourceName": "Property",
"frequency": 1000
},
{
"resourceName": "Media",
"fieldName": "ResourceRecordKey",
"availability": 0.5,
"availability": 0.25,
"parentResourceName": "Property",
"frequency": 500
},
{
"resourceName": "Media",
"fieldName": "MediaModificationTimestamp",
"availability": 2,
"availability": 1,
"parentResourceName": "Property",
"frequency": 2000
}
Expand Down Expand Up @@ -118,6 +118,7 @@
"resourceName": "Office",
"recordCount": 1000,
"numRecordsFetched": 1000,
"numUniqueRecordsFetched": 1000,
"numSamples": 10,
"pageSize": 100,
"averageResponseBytes": 100000,
Expand All @@ -131,6 +132,7 @@
"resourceName": "Property",
"recordCount": 1000,
"numRecordsFetched": 1000,
"numUniqueRecordsFetched": 1000,
"numSamples": 10,
"pageSize": 100,
"averageResponseBytes": 100000,
Expand All @@ -152,17 +154,19 @@
"dateField": "ModificationTimestamp",
"dateLow": "2021-03-15T10:12:32.319Z",
"dateHigh": "2022-03-15T10:12:32.319Z",
"keyFields": ["MemberKey"]
"keyFields": ["MemberKey"],
"numExpandedRecordsFetched": 2000,
"numUniqueRecordsFetched": 2000
}
]
}
],
"availability": {
"fields": {
"total": { "eqZero": 0, "gtZero": 8, "gte25": 8, "gte50": 8, "gte75": 6, "eq100": 3 },
"reso": { "eqZero": 0, "gtZero": 6, "gte25": 6, "gte50": 6, "gte75": 5, "eq100": 2 },
"idx": { "eqZero": 0, "gtZero": 6, "gte25": 6, "gte50": 6, "gte75": 5, "eq100": 2 },
"local": { "eqZero": 0, "gtZero": 2, "gte25": 2, "gte50": 2, "gte75": 1, "eq100": 1 }
"total": { "eqZero": 0, "gtZero": 8, "gte25": 8, "gte50": 7, "gte75": 5, "eq100": 3 },
"reso": { "eqZero": 0, "gtZero": 6, "gte25": 6, "gte50": 5, "gte75": 5, "eq100": 3 },
"idx": { "eqZero": 0, "gtZero": 6, "gte25": 6, "gte50": 5, "gte75": 5, "eq100": 3 },
"local": { "eqZero": 0, "gtZero": 2, "gte25": 2, "gte50": 2, "gte75": 0, "eq100": 0 }
},
"lookups": {
"total": { "eqZero": 0, "gtZero": 7, "gte25": 2, "gte50": 2, "gte75": 2, "eq100": 0 },
Expand All @@ -186,10 +190,10 @@
"expansions": {
"Media": {
"fields": {
"total": 1.1666666666666667,
"reso": 1.25,
"local": 1,
"idx": 1.25
"total": 0.5833333333333334,
"reso": 0.625,
"local": 0.5,
"idx": 0.625
},
"lookups": {
"total": 0,
Expand Down Expand Up @@ -250,33 +254,33 @@
"eqZero": 0,
"gtZero": 3,
"gte25": 3,
"gte50": 3,
"gte75": 2,
"gte50": 2,
"gte75": 1,
"eq100": 1
},
"reso": {
"eqZero": 0,
"gtZero": 2,
"gte25": 2,
"gte50": 2,
"gte50": 1,
"gte75": 1,
"eq100": 0
"eq100": 1
},
"idx": {
"eqZero": 0,
"gtZero": 2,
"gte25": 2,
"gte50": 2,
"gte50": 1,
"gte75": 1,
"eq100": 0
"eq100": 1
},
"local": {
"eqZero": 0,
"gtZero": 1,
"gte25": 1,
"gte50": 1,
"gte75": 1,
"eq100": 1
"gte75": 0,
"eq100": 0
}
},
"lookups": {
Expand Down
Loading