Skip to content

Commit cba6d43

Browse files
author
Andrea Barbasso
committed
[DURACOM-309] fix circular dependency
1 parent f1a1aeb commit cba6d43

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

src/app/core/log/log.interceptor.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import {
1616
appReducers,
1717
storeModuleConfig,
1818
} from '../../app.reducer';
19+
import { CorrelationIdService } from '../../correlation-id/correlation-id.service';
20+
import { OrejimeService } from '../../shared/cookies/orejime.service';
1921
import {
2022
CORRELATION_ID_COOKIE,
21-
CorrelationIdService,
22-
} from '../../correlation-id/correlation-id.service';
23-
import { OrejimeService } from '../../shared/cookies/orejime.service';
24-
import { CORRELATION_ID_OREJIME_KEY } from '../../shared/cookies/orejime-configuration';
23+
CORRELATION_ID_OREJIME_KEY,
24+
} from '../../shared/cookies/orejime-configuration';
2525
import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
2626
import { RouterStub } from '../../shared/testing/router.stub';
2727
import { RestRequestMethod } from '../data/rest-request-method';

src/app/correlation-id/correlation-id.service.spec.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ import {
1212
storeModuleConfig,
1313
} from '../app.reducer';
1414
import { UUIDService } from '../core/shared/uuid.service';
15+
import { CORRELATION_ID_COOKIE } from '../shared/cookies/orejime-configuration';
1516
import { CookieServiceMock } from '../shared/mocks/cookie.service.mock';
1617
import { SetCorrelationIdAction } from './correlation-id.actions';
17-
import {
18-
CORRELATION_ID_COOKIE,
19-
CorrelationIdService,
20-
} from './correlation-id.service';
18+
import { CorrelationIdService } from './correlation-id.service';
2119

2220
describe('CorrelationIdService', () => {
2321
let service: CorrelationIdService;

src/app/correlation-id/correlation-id.service.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ import {
1616
} from '../core/services/window.service';
1717
import { UUIDService } from '../core/shared/uuid.service';
1818
import { OrejimeService } from '../shared/cookies/orejime.service';
19-
import { CORRELATION_ID_OREJIME_KEY } from '../shared/cookies/orejime-configuration';
19+
import {
20+
CORRELATION_ID_COOKIE,
21+
CORRELATION_ID_OREJIME_KEY,
22+
} from '../shared/cookies/orejime-configuration';
2023
import { isEmpty } from '../shared/empty.util';
2124
import { SetCorrelationIdAction } from './correlation-id.actions';
2225
import { correlationIdSelector } from './correlation-id.selector';
2326

24-
export const CORRELATION_ID_COOKIE = 'CORRELATION-ID';
25-
2627
/**
2728
* Service to manage the correlation id, an id used to give context to server side logs
2829
*/

src/app/shared/cookies/orejime-configuration.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
} from '../../core/google-recaptcha/google-recaptcha.service';
1010
import { LANG_COOKIE } from '../../core/locale/locale.service';
1111
import { NativeWindowRef } from '../../core/services/window.service';
12-
import { CORRELATION_ID_COOKIE } from '../../correlation-id/correlation-id.service';
1312

1413
/**
1514
* Cookie for has_agreed_end_user
@@ -26,6 +25,8 @@ export const MATOMO_COOKIE = 'dsMatomo';
2625

2726
export const CORRELATION_ID_OREJIME_KEY = 'correlation-id';
2827

28+
export const CORRELATION_ID_COOKIE = 'CORRELATION-ID';
29+
2930
/**
3031
* Orejime configuration
3132
* For more information see https://github.com/empreinte-digitale/orejime

0 commit comments

Comments
 (0)