Skip to content

Commit 0047913

Browse files
committed
[DURACOM-191] Add missing data service
1 parent 2e88177 commit 0047913

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

src/app/core/data-services-map.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import { WORKSPACEITEM } from './eperson/models/workspaceitem.resource-type';
2727
import { FEEDBACK } from './feedback/models/feedback.resource-type';
2828
import { METADATA_FIELD } from './metadata/metadata-field.resource-type';
2929
import { METADATA_SCHEMA } from './metadata/metadata-schema.resource-type';
30+
import { SUGGESTION } from './notifications/models/suggestion-objects.resource-type';
3031
import { SUGGESTION_SOURCE } from './notifications/models/suggestion-source-object.resource-type';
3132
import { SUGGESTION_TARGET } from './notifications/models/suggestion-target-object.resource-type';
3233
import { QUALITY_ASSURANCE_EVENT_OBJECT } from './notifications/qa/models/quality-assurance-event-object.resource-type';
@@ -130,6 +131,7 @@ export const LAZY_DATA_SERVICES: LazyDataServicesMap = {
130131
[QUALITY_ASSURANCE_EVENT_OBJECT.value]: () => import('./notifications/qa/events/quality-assurance-event-data.service').then(m => m.QualityAssuranceEventDataService),
131132
[QUALITY_ASSURANCE_SOURCE_OBJECT.value]: () => import('./notifications/qa/source/quality-assurance-source-data.service').then(m => m.QualityAssuranceSourceDataService),
132133
[QUALITY_ASSURANCE_TOPIC_OBJECT.value]: () => import('./notifications/qa/topics/quality-assurance-topic-data.service').then(m => m.QualityAssuranceTopicDataService),
134+
[SUGGESTION.value]: () => import('./notifications/suggestions-data.service').then(m => m.SuggestionsDataService),
133135
[SUGGESTION_SOURCE.value]: () => import('./notifications/source/suggestion-source-data.service').then(m => m.SuggestionSourceDataService),
134136
[SUGGESTION_TARGET.value]: () => import('./notifications/target/suggestion-target-data.service').then(m => m.SuggestionTargetDataService),
135137
[DUPLICATE.value]: () => import('./submission/submission-duplicate-data.service').then(m => m.SubmissionDuplicateDataService),

src/app/core/notifications/suggestions-data.service.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import { Observable } from 'rxjs';
66

77
import { NotificationsService } from '../../shared/notifications/notifications.service';
88
import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
9-
import { dataService } from '../cache/builders/build-decorators';
109
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
1110
import { RequestParam } from '../cache/models/request-param.model';
1211
import { ObjectCacheService } from '../cache/object-cache.service';
1312
import { CoreState } from '../core-state.model';
13+
import { IdentifiableDataService } from '../data/base/identifiable-data.service';
1414
import { ChangeAnalyzer } from '../data/change-analyzer';
1515
import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
1616
import { FindListOptions } from '../data/find-list-options.model';
@@ -21,7 +21,6 @@ import { UpdateDataServiceImpl } from '../data/update-data.service';
2121
import { HALEndpointService } from '../shared/hal-endpoint.service';
2222
import { NoContent } from '../shared/NoContent.model';
2323
import { Suggestion } from './models/suggestion.model';
24-
import { SUGGESTION } from './models/suggestion-objects.resource-type';
2524
import { SuggestionSource } from './models/suggestion-source.model';
2625
import { SuggestionTarget } from './models/suggestion-target.model';
2726
import { SuggestionSourceDataService } from './source/suggestion-source-data.service';
@@ -65,8 +64,7 @@ export class SuggestionDataServiceImpl extends UpdateDataServiceImpl<Suggestion>
6564
* The service handling all Suggestion Target REST requests.
6665
*/
6766
@Injectable({ providedIn: 'root' })
68-
@dataService(SUGGESTION)
69-
export class SuggestionsDataService {
67+
export class SuggestionsDataService extends IdentifiableDataService<Suggestion> {
7068
protected searchFindBySourceMethod = 'findBySource';
7169
protected searchFindByTargetAndSourceMethod = 'findByTargetAndSource';
7270

@@ -85,12 +83,11 @@ export class SuggestionsDataService {
8583
*/
8684
private suggestionTargetsDataService: SuggestionTargetDataService;
8785

88-
private responseMsToLive = 10 * 1000;
89-
9086
/**
9187
* Initialize service variables
9288
* @param {RequestService} requestService
9389
* @param {RemoteDataBuildService} rdbService
90+
* @param {Store} store
9491
* @param {ObjectCacheService} objectCache
9592
* @param {HALEndpointService} halService
9693
* @param {NotificationsService} notificationsService
@@ -102,6 +99,7 @@ export class SuggestionsDataService {
10299
constructor(
103100
protected requestService: RequestService,
104101
protected rdbService: RemoteDataBuildService,
102+
protected store: Store<CoreState>,
105103
protected objectCache: ObjectCacheService,
106104
protected halService: HALEndpointService,
107105
protected notificationsService: NotificationsService,
@@ -110,6 +108,7 @@ export class SuggestionsDataService {
110108
protected comparatorSources: DefaultChangeAnalyzer<SuggestionSource>,
111109
protected comparatorTargets: DefaultChangeAnalyzer<SuggestionTarget>,
112110
) {
111+
super('suggestions', requestService, rdbService, objectCache, halService);
113112
this.suggestionsDataService = new SuggestionDataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparatorSuggestions, this.responseMsToLive);
114113
this.suggestionSourcesDataService = new SuggestionSourceDataService(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparatorSources);
115114
this.suggestionTargetsDataService = new SuggestionTargetDataService(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparatorTargets);

0 commit comments

Comments
 (0)