Skip to content

Commit 0176b3b

Browse files
refactor: move startingUp flag update after store in mySegmentsUpdater
1 parent c09f14d commit 0176b3b

File tree

3 files changed

+4
-28
lines changed

3 files changed

+4
-28
lines changed

src/storages/inLocalStorage/MySegmentsCacheInLocal.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ import { ILogger } from '../../logger/types';
22
import { isNaNNumber } from '../../utils/lang';
33
import { AbstractMySegmentsCacheSync } from '../AbstractMySegmentsCacheSync';
44
import type { MySegmentsKeyBuilder } from '../KeyBuilderCS';
5-
import { LOG_PREFIX, DEFINED } from './constants';
5+
import { DEFINED } from './constants';
66
import { StorageAdapter } from '../types';
7-
import { MySegmentsData } from '../../sync/polling/types';
8-
import { IMySegmentsResponse } from '../../dtos/types';
97

108
export class MySegmentsCacheInLocal extends AbstractMySegmentsCacheSync {
119

@@ -71,13 +69,4 @@ export class MySegmentsCacheInLocal extends AbstractMySegmentsCacheSync {
7169
return n;
7270
}
7371

74-
resetSegments(segmentsData: MySegmentsData | IMySegmentsResponse) {
75-
try {
76-
return super.resetSegments(segmentsData);
77-
} catch (e) {
78-
this.log.error(LOG_PREFIX + e);
79-
return false;
80-
}
81-
}
82-
8372
}

src/storages/inLocalStorage/__tests__/MySegmentsCacheInLocal.spec.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,3 @@ test.each(storages)('SEGMENT CACHE / in LocalStorage', (storage) => {
3939
expect(storage.getItem(PREFIX + '.user.largeSegment.mocked-segment-2')).toBe('1');
4040
expect(storage.getItem(PREFIX + '.user.largeSegment.mocked-segment')).toBe(null);
4141
});
42-
43-
test('SEGMENT CACHE / Special case: localStorage failure should not throw an exception', () => {
44-
const cache = new MySegmentsCacheInLocal(loggerMock, new KeyBuilderCS(PREFIX, 'user2'), localStorage);
45-
46-
// mock localStorage failure
47-
const setItemSpy = jest.spyOn(localStorage, 'setItem').mockImplementation(() => { throw new Error('localStorage failure'); });
48-
setItemSpy.mockClear();
49-
50-
expect(cache.resetSegments({ k: [{ n: 'mocked-segment' }, { n: 'mocked-segment-2' }], cn: 123 })).toBe(false);
51-
expect(setItemSpy).toHaveBeenCalledTimes(1);
52-
53-
setItemSpy.mockRestore();
54-
});

src/sync/polling/updaters/mySegmentsUpdater.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ export function mySegmentsUpdaterFactory(
6666
new Promise((res) => { updateSegments(segmentsData); res(true); }) :
6767
// If not provided, fetch mySegments
6868
mySegmentsFetcher(matchingKey, noCache, till, _promiseDecorator).then(segments => {
69-
// Only when we have downloaded segments completely, we should not keep retrying anymore
70-
startingUp = false;
71-
7269
updateSegments(segments);
70+
71+
// Only when we have downloaded and stored segments completely, we should not keep retrying anymore
72+
startingUp = false;
7373
return true;
7474
});
7575

0 commit comments

Comments
 (0)