Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-09-05 17:53:12 +02:00
Code Issues Projects Releases Wiki Activity

fix: last seen cherrypick (#5717)

Browse Source
This commit is contained in:
Mateusz Kwasniewski 2023-12-21 14:14:16 +01:00 committed by GitHub
parent 3f27a79566
commit 50a32d557c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/lib/features/feature-toggle/feature-toggle-strategies-store.ts
View File

@ -25,6 +25,7 @@ import { ensureStringValue, mapValues } from '../../util';
import { IFeatureProjectUserParams } from './feature-toggle-controller'; import { IFeatureProjectUserParams } from './feature-toggle-controller';
import { Db } from '../../db/db'; import { Db } from '../../db/db';
import Raw = Knex.Raw; import Raw = Knex.Raw;
import { isAfter } from 'date-fns';
import { import {
IFeatureSearchParams, IFeatureSearchParams,
IQueryParam, IQueryParam,
@ -387,7 +388,6 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore {
acc.description = r.description; acc.description = r.description;
acc.project = r.project; acc.project = r.project;
acc.stale = r.stale; acc.stale = r.stale;
acc.lastSeenAt = r.last_seen_at;
acc.createdAt = r.created_at; acc.createdAt = r.created_at;
acc.type = r.type; acc.type = r.type;
@ -399,8 +399,11 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore {
} }
if ( if (
acc.lastSeenAt === undefined || acc.lastSeenAt == null ||
new Date(r.env_last_seen_at) > new Date(acc.lastSeenAt) isAfter(
new Date(r.env_last_seen_at),
new Date(acc.lastSeenAt),
)
) { ) {
acc.lastSeenAt = r.env_last_seen_at; acc.lastSeenAt = r.env_last_seen_at;
} }
@ -861,7 +864,7 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore {
getAggregatedSearchData(rows): IFeatureOverview { getAggregatedSearchData(rows): IFeatureOverview {
return rows.reduce((acc, row) => { return rows.reduce((acc, row) => {
if (acc[row.feature_name] !== undefined) { if (acc[row.feature_name]) {
const environmentExists = acc[ const environmentExists = acc[
row.feature_name row.feature_name
].environments.some( ].environments.some(
@ -906,9 +909,10 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore {
} }
const featureRow = acc[row.feature_name]; const featureRow = acc[row.feature_name];
if ( if (
featureRow.lastSeenAt === undefined || isAfter(
new Date(row.env_last_seen_at) > new Date(row.env_last_seen_at),
new Date(featureRow.last_seen_at) new Date(featureRow.lastSeenAt),
)
) { ) {
featureRow.lastSeenAt = row.env_last_seen_at; featureRow.lastSeenAt = row.env_last_seen_at;
} }
@ -918,7 +922,7 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore {
getFeatureOverviewData(rows): IFeatureOverview { getFeatureOverviewData(rows): IFeatureOverview {
return rows.reduce((acc, row) => { return rows.reduce((acc, row) => {
if (acc[row.feature_name] !== undefined) { if (acc[row.feature_name]) {
const environmentExists = acc[ const environmentExists = acc[
row.feature_name row.feature_name
].environments.some( ].environments.some(
@ -953,9 +957,10 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore {
} }
const featureRow = acc[row.feature_name]; const featureRow = acc[row.feature_name];
if ( if (
featureRow.lastSeenAt === undefined || isAfter(
new Date(row.env_last_seen_at) > new Date(row.env_last_seen_at),
new Date(featureRow.last_seen_at) new Date(featureRow.lastSeenAt),
)
) { ) {
featureRow.lastSeenAt = row.env_last_seen_at; featureRow.lastSeenAt = row.env_last_seen_at;
} }

4
src/lib/features/feature-toggle/tests/feature-toggle-service.e2e.test.ts
View File

@ -680,13 +680,14 @@ test('Should return last seen at per environment', async () => {
db.rawDatabase, db.rawDatabase,
); );
const { environments } = await service.getFeature({ const { environments, lastSeenAt } = await service.getFeature({
featureName, featureName,
projectId: 'default', projectId: 'default',
environmentVariants: false, environmentVariants: false,
}); });
expect(environments[0].lastSeenAt).toEqual(new Date(date)); expect(environments[0].lastSeenAt).toEqual(new Date(date));
expect(lastSeenAt).toEqual(new Date(date));
// Test with feature flag on // Test with feature flag on
const config = createTestConfig(); const config = createTestConfig();
@ -707,4 +708,5 @@ test('Should return last seen at per environment', async () => {
expect(featureToggle.environments[0].lastSeenAt).toEqual( expect(featureToggle.environments[0].lastSeenAt).toEqual(
new Date(lastSeenAtStoreDate), new Date(lastSeenAtStoreDate),
); );
expect(featureToggle.lastSeenAt).toEqual(new Date(lastSeenAtStoreDate));
}); });

13
src/test/e2e/api/admin/project/projects.e2e.test.ts
View File

@ -165,6 +165,7 @@ test('response should include last seen at per environment', async () => {
.expect(200); .expect(200);
expect(body.features[0].environments[0].lastSeenAt).toEqual(testDate); expect(body.features[0].environments[0].lastSeenAt).toEqual(testDate);
expect(body.features[0].lastSeenAt).toEqual(testDate);
const appWithLastSeenRefactor = await setupAppWithCustomConfig( const appWithLastSeenRefactor = await setupAppWithCustomConfig(
db.stores, db.stores,
@ -180,6 +181,9 @@ test('response should include last seen at per environment', async () => {
expect(response.body.features[0].environments[0].lastSeenAt).toEqual( expect(response.body.features[0].environments[0].lastSeenAt).toEqual(
'2023-10-01T12:34:56.000Z', '2023-10-01T12:34:56.000Z',
); );
expect(response.body.features[0].lastSeenAt).toEqual(
'2023-10-01T12:34:56.000Z',
);
}); });
test('response should include last seen at per environment for multiple environments', async () => { test('response should include last seen at per environment for multiple environments', async () => {
@ -221,16 +225,19 @@ test('response should include last seen at per environment for multiple environm
'multiple-environment-last-seen-at', 'multiple-environment-last-seen-at',
db.rawDatabase, db.rawDatabase,
'default', 'default',
'2023-10-01 12:32:56',
); );
await insertLastSeenAt( await insertLastSeenAt(
'multiple-environment-last-seen-at', 'multiple-environment-last-seen-at',
db.rawDatabase, db.rawDatabase,
'development', 'development',
'2023-10-01 12:34:56',
); );
await insertLastSeenAt( await insertLastSeenAt(
'multiple-environment-last-seen-at', 'multiple-environment-last-seen-at',
db.rawDatabase, db.rawDatabase,
'production', 'production',
'2023-10-01 12:33:56',
); );
const { body } = await appWithLastSeenRefactor.request const { body } = await appWithLastSeenRefactor.request
@ -243,11 +250,13 @@ test('response should include last seen at per environment for multiple environm
const [def, development, production] = featureEnvironments; const [def, development, production] = featureEnvironments;
expect(def.name).toBe('default'); expect(def.name).toBe('default');
expect(def.lastSeenAt).toEqual('2023-10-01T12:34:56.000Z'); expect(def.lastSeenAt).toEqual('2023-10-01T12:32:56.000Z');
expect(development.name).toBe('development'); expect(development.name).toBe('development');
expect(development.lastSeenAt).toEqual('2023-10-01T12:34:56.000Z'); expect(development.lastSeenAt).toEqual('2023-10-01T12:34:56.000Z');
expect(production.name).toBe('production'); expect(production.name).toBe('production');
expect(production.lastSeenAt).toEqual('2023-10-01T12:34:56.000Z'); expect(production.lastSeenAt).toEqual('2023-10-01T12:33:56.000Z');
expect(body.features[1].lastSeenAt).toBe('2023-10-01T12:34:56.000Z');
}); });