Skip to content

fix: add top to the file-list cache key signature #2406

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
merged 1 commit into from
Jun 6, 2023
Merged

fix: add top to the file-list cache key signature #2406

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 36 additions & 24 deletions packages/mgt-components/src/graph/graph.files.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,13 +434,14 @@ export async function getUserInsightsDriveItemById(
// GET /me/drive/root/children
export async function getFilesIterator(graph: IGraph, top?: number): Promise<GraphPageIterator<DriveItem>> {
const endpoint = '/me/drive/root/children';
const cacheKey = `${endpoint}?top=${top}`;
let filesPageIterator;

// get iterator from cached values
let cache: CacheStore<CacheFileList>;
const cacheStore = schemas.fileLists.stores.fileLists;
cache = CacheService.getCache<CacheFileList>(schemas.fileLists, cacheStore);
const fileList = await getFileListFromCache(cache, cacheStore, endpoint);
const fileList = await getFileListFromCache(cache, cacheStore, cacheKey);
if (fileList) {
filesPageIterator = await getFilesPageIteratorFromCache(graph, fileList.files, fileList.nextLink);

Expand All @@ -458,7 +459,7 @@ export async function getFilesIterator(graph: IGraph, top?: number): Promise<Gra
filesPageIterator = await getFilesPageIteratorFromRequest(graph, request);

if (getIsFileListsCacheEnabled()) {
cache.putValue(endpoint, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
cache.putValue(cacheKey, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
}
} catch {}
return filesPageIterator || null;
Expand All @@ -472,13 +473,14 @@ export async function getDriveFilesByIdIterator(
top?: number
): Promise<GraphPageIterator<DriveItem>> {
const endpoint = `/drives/${driveId}/items/${itemId}/children`;
const cacheKey = `${endpoint}?top=${top}`;
let filesPageIterator;

// get iterator from cached values
let cache: CacheStore<CacheFileList>;
const cacheStore = schemas.fileLists.stores.fileLists;
cache = CacheService.getCache<CacheFileList>(schemas.fileLists, cacheStore);
const fileList = await getFileListFromCache(cache, cacheStore, endpoint);
const fileList = await getFileListFromCache(cache, cacheStore, cacheKey);
if (fileList) {
filesPageIterator = await getFilesPageIteratorFromCache(graph, fileList.files, fileList.nextLink);

Expand All @@ -496,7 +498,7 @@ export async function getDriveFilesByIdIterator(
filesPageIterator = await getFilesPageIteratorFromRequest(graph, request);

if (getIsFileListsCacheEnabled()) {
cache.putValue(endpoint, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
cache.putValue(cacheKey, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
}
} catch {}
return filesPageIterator || null;
Expand All @@ -510,13 +512,14 @@ export async function getDriveFilesByPathIterator(
top?: number
): Promise<GraphPageIterator<DriveItem>> {
const endpoint = `/drives/${driveId}/root:/${itemPath}:/children`;
const cacheKey = `${endpoint}?top=${top}`;
let filesPageIterator;

// get iterator from cached values
let cache: CacheStore<CacheFileList>;
const cacheStore = schemas.fileLists.stores.fileLists;
cache = CacheService.getCache<CacheFileList>(schemas.fileLists, cacheStore);
const fileList = await getFileListFromCache(cache, cacheStore, endpoint);
const fileList = await getFileListFromCache(cache, cacheStore, cacheKey);
if (fileList) {
filesPageIterator = await getFilesPageIteratorFromCache(graph, fileList.files, fileList.nextLink);

Expand All @@ -534,7 +537,7 @@ export async function getDriveFilesByPathIterator(
filesPageIterator = await getFilesPageIteratorFromRequest(graph, request);

if (getIsFileListsCacheEnabled()) {
cache.putValue(endpoint, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
cache.putValue(cacheKey, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
}
} catch {}
return filesPageIterator || null;
Expand All @@ -548,13 +551,14 @@ export async function getGroupFilesByIdIterator(
top?: number
): Promise<GraphPageIterator<DriveItem>> {
const endpoint = `/groups/${groupId}/drive/items/${itemId}/children`;
const cacheKey = `${endpoint}?top=${top}`;
let filesPageIterator;

// get iterator from cached values
let cache: CacheStore<CacheFileList>;
const cacheStore = schemas.fileLists.stores.fileLists;
cache = CacheService.getCache<CacheFileList>(schemas.fileLists, cacheStore);
const fileList = await getFileListFromCache(cache, cacheStore, endpoint);
const fileList = await getFileListFromCache(cache, cacheStore, cacheKey);
if (fileList) {
filesPageIterator = await getFilesPageIteratorFromCache(graph, fileList.files, fileList.nextLink);

Expand All @@ -572,7 +576,7 @@ export async function getGroupFilesByIdIterator(
filesPageIterator = await getFilesPageIteratorFromRequest(graph, request);

if (getIsFileListsCacheEnabled()) {
cache.putValue(endpoint, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
cache.putValue(cacheKey, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
}
} catch {}
return filesPageIterator || null;
Expand All @@ -586,13 +590,14 @@ export async function getGroupFilesByPathIterator(
top?: number
): Promise<GraphPageIterator<DriveItem>> {
const endpoint = `/groups/${groupId}/drive/root:/${itemPath}:/children`;
const cacheKey = `${endpoint}?top=${top}`;
let filesPageIterator;

// get iterator from cached values
let cache: CacheStore<CacheFileList>;
const cacheStore = schemas.fileLists.stores.fileLists;
cache = CacheService.getCache<CacheFileList>(schemas.fileLists, cacheStore);
const fileList = await getFileListFromCache(cache, cacheStore, endpoint);
const fileList = await getFileListFromCache(cache, cacheStore, cacheKey);
if (fileList) {
filesPageIterator = await getFilesPageIteratorFromCache(graph, fileList.files, fileList.nextLink);

Expand All @@ -610,7 +615,7 @@ export async function getGroupFilesByPathIterator(
filesPageIterator = await getFilesPageIteratorFromRequest(graph, request);

if (getIsFileListsCacheEnabled()) {
cache.putValue(endpoint, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
cache.putValue(cacheKey, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
}
} catch {}
return filesPageIterator || null;
Expand All @@ -623,13 +628,14 @@ export async function getFilesByIdIterator(
top?: number
): Promise<GraphPageIterator<DriveItem>> {
const endpoint = `/me/drive/items/${itemId}/children`;
const cacheKey = `${endpoint}?top=${top}`;
let filesPageIterator;

// get iterator from cached values
let cache: CacheStore<CacheFileList>;
const cacheStore = schemas.fileLists.stores.fileLists;
cache = CacheService.getCache<CacheFileList>(schemas.fileLists, cacheStore);
const fileList = await getFileListFromCache(cache, cacheStore, endpoint);
const fileList = await getFileListFromCache(cache, cacheStore, cacheKey);
if (fileList) {
filesPageIterator = await getFilesPageIteratorFromCache(graph, fileList.files, fileList.nextLink);

Expand All @@ -647,7 +653,7 @@ export async function getFilesByIdIterator(
filesPageIterator = await getFilesPageIteratorFromRequest(graph, request);

if (getIsFileListsCacheEnabled()) {
cache.putValue(endpoint, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
cache.putValue(cacheKey, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
}
} catch {}
return filesPageIterator || null;
Expand All @@ -660,13 +666,14 @@ export async function getFilesByPathIterator(
top?: number
): Promise<GraphPageIterator<DriveItem>> {
const endpoint = `/me/drive/root:/${itemPath}:/children`;
const cacheKey = `${endpoint}?top=${top}`;
let filesPageIterator;

// get iterator from cached values
let cache: CacheStore<CacheFileList>;
const cacheStore = schemas.fileLists.stores.fileLists;
cache = CacheService.getCache<CacheFileList>(schemas.fileLists, cacheStore);
const fileList = await getFileListFromCache(cache, cacheStore, endpoint);
const fileList = await getFileListFromCache(cache, cacheStore, cacheKey);
if (fileList) {
filesPageIterator = await getFilesPageIteratorFromCache(graph, fileList.files, fileList.nextLink);

Expand All @@ -684,7 +691,7 @@ export async function getFilesByPathIterator(
filesPageIterator = await getFilesPageIteratorFromRequest(graph, request);

if (getIsFileListsCacheEnabled()) {
cache.putValue(endpoint, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
cache.putValue(cacheKey, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
}
} catch {}
return filesPageIterator || null;
Expand All @@ -698,13 +705,14 @@ export async function getSiteFilesByIdIterator(
top?: number
): Promise<GraphPageIterator<DriveItem>> {
const endpoint = `/sites/${siteId}/drive/items/${itemId}/children`;
const cacheKey = `${endpoint}?top=${top}`;
let filesPageIterator;

// get iterator from cached values
let cache: CacheStore<CacheFileList>;
const cacheStore = schemas.fileLists.stores.fileLists;
cache = CacheService.getCache<CacheFileList>(schemas.fileLists, cacheStore);
const fileList = await getFileListFromCache(cache, cacheStore, endpoint);
const fileList = await getFileListFromCache(cache, cacheStore, cacheKey);
if (fileList) {
filesPageIterator = await getFilesPageIteratorFromCache(graph, fileList.files, fileList.nextLink);

Expand All @@ -722,7 +730,7 @@ export async function getSiteFilesByIdIterator(
filesPageIterator = await getFilesPageIteratorFromRequest(graph, request);

if (getIsFileListsCacheEnabled()) {
cache.putValue(endpoint, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
cache.putValue(cacheKey, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
}
} catch {}
return filesPageIterator || null;
Expand All @@ -736,13 +744,14 @@ export async function getSiteFilesByPathIterator(
top?: number
): Promise<GraphPageIterator<DriveItem>> {
const endpoint = `/sites/${siteId}/drive/root:/${itemPath}:/children`;
const cacheKey = `${endpoint}?top=${top}`;
let filesPageIterator;

// get iterator from cached values
let cache: CacheStore<CacheFileList>;
const cacheStore = schemas.fileLists.stores.fileLists;
cache = CacheService.getCache<CacheFileList>(schemas.fileLists, cacheStore);
const fileList = await getFileListFromCache(cache, cacheStore, endpoint);
const fileList = await getFileListFromCache(cache, cacheStore, cacheKey);
if (fileList) {
filesPageIterator = await getFilesPageIteratorFromCache(graph, fileList.files, fileList.nextLink);

Expand All @@ -760,7 +769,7 @@ export async function getSiteFilesByPathIterator(
filesPageIterator = await getFilesPageIteratorFromRequest(graph, request);

if (getIsFileListsCacheEnabled()) {
cache.putValue(endpoint, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
cache.putValue(cacheKey, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
}
} catch {}
return filesPageIterator || null;
Expand All @@ -774,13 +783,14 @@ export async function getUserFilesByIdIterator(
top?: number
): Promise<GraphPageIterator<DriveItem>> {
const endpoint = `/users/${userId}/drive/items/${itemId}/children`;
const cacheKey = `${endpoint}?top=${top}`;
let filesPageIterator;

// get iterator from cached values
let cache: CacheStore<CacheFileList>;
const cacheStore = schemas.fileLists.stores.fileLists;
cache = CacheService.getCache<CacheFileList>(schemas.fileLists, cacheStore);
const fileList = await getFileListFromCache(cache, cacheStore, endpoint);
const fileList = await getFileListFromCache(cache, cacheStore, cacheKey);
if (fileList) {
filesPageIterator = await getFilesPageIteratorFromCache(graph, fileList.files, fileList.nextLink);

Expand All @@ -798,7 +808,7 @@ export async function getUserFilesByIdIterator(
filesPageIterator = await getFilesPageIteratorFromRequest(graph, request);

if (getIsFileListsCacheEnabled()) {
cache.putValue(endpoint, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
cache.putValue(cacheKey, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
}
} catch {}
return filesPageIterator || null;
Expand All @@ -812,13 +822,14 @@ export async function getUserFilesByPathIterator(
top?: number
): Promise<GraphPageIterator<DriveItem>> {
const endpoint = `/users/${userId}/drive/root:/${itemPath}:/children`;
const cacheKey = `${endpoint}?top=${top}`;
let filesPageIterator;

// get iterator from cached values
let cache: CacheStore<CacheFileList>;
const cacheStore = schemas.fileLists.stores.fileLists;
cache = CacheService.getCache<CacheFileList>(schemas.fileLists, cacheStore);
const fileList = await getFileListFromCache(cache, cacheStore, endpoint);
const fileList = await getFileListFromCache(cache, cacheStore, cacheKey);
if (fileList) {
filesPageIterator = await getFilesPageIteratorFromCache(graph, fileList.files, fileList.nextLink);

Expand All @@ -836,7 +847,7 @@ export async function getUserFilesByPathIterator(
filesPageIterator = await getFilesPageIteratorFromRequest(graph, request);

if (getIsFileListsCacheEnabled()) {
cache.putValue(endpoint, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
cache.putValue(cacheKey, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
}
} catch {}
return filesPageIterator || null;
Expand All @@ -847,13 +858,14 @@ export async function getFilesByListQueryIterator(
listQuery: string,
top?: number
): Promise<GraphPageIterator<DriveItem>> {
const cacheKey = `${listQuery}?top=${top}`;
let filesPageIterator;

// get iterator from cached values
let cache: CacheStore<CacheFileList>;
const cacheStore = schemas.fileLists.stores.fileLists;
cache = CacheService.getCache<CacheFileList>(schemas.fileLists, cacheStore);
const fileList = await getFileListFromCache(cache, cacheStore, listQuery);
const fileList = await getFileListFromCache(cache, cacheStore, cacheKey);
if (fileList) {
filesPageIterator = await getFilesPageIteratorFromCache(graph, fileList.files, fileList.nextLink);

Expand All @@ -872,7 +884,7 @@ export async function getFilesByListQueryIterator(
filesPageIterator = await getFilesPageIteratorFromRequest(graph, request);

if (getIsFileListsCacheEnabled()) {
cache.putValue(listQuery, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
cache.putValue(cacheKey, { files: filesPageIterator.value, nextLink: filesPageIterator._nextLink });
}
} catch {}
return filesPageIterator || null;
Expand Down