fix(datacite-tracker): reverted undesired refactor

opaduchak · opaduchak · commit 224879b67e7c · 2025-09-01T17:49:07.000+03:00
diff --git a/src/app/features/preprints/mappers/preprints.mapper.ts b/src/app/features/preprints/mappers/preprints.mapper.ts
@@ -1,7 +1,6 @@
 import { LicensesMapper } from '@osf/shared/mappers';
 import { ApiData, JsonApiResponseWithMeta, ResponseJsonApi } from '@osf/shared/models';
 import { StringOrNull } from '@shared/helpers';
-import { IdentifiersMapper } from '@shared/mappers/identifiers.mapper';
 
 import {
   Preprint,
@@ -137,7 +136,12 @@ export class PreprintsMapper {
         views: meta.metrics.views,
       },
       embeddedLicense: LicensesMapper.fromLicenseDataJsonApi(data.embeds.license.data),
-      identifiers: IdentifiersMapper.fromEmbeds(data.embeds.identifiers),
+      identifiers: data.embeds.identifiers?.data.map((identifier) => ({
+        id: identifier.id,
+        type: identifier.type,
+        value: identifier.attributes.value,
+        category: identifier.attributes.category,
+      })),
       preprintDoiLink: links.preprint_doi,
       articleDoiLink: links.doi,
     };
diff --git a/src/app/features/preprints/models/preprint-json-api.models.ts b/src/app/features/preprints/models/preprint-json-api.models.ts
@@ -1,7 +1,6 @@
 import { UserPermissions } from '@osf/shared/enums';
 import { BooleanOrNull, StringOrNull } from '@osf/shared/helpers';
 import { ContributorResponse, LicenseRecordJsonApi, LicenseResponseJsonApi } from '@osf/shared/models';
-import { IdentifiersEmbedJsonApiResponse } from '@shared/models/identifiers/identifier-json-api';
 
 import { ApplicabilityStatus, PreregLinkInfo, ReviewsState } from '../enums';
 
@@ -70,7 +69,16 @@ export interface PreprintEmbedsJsonApi {
     data: ContributorResponse[];
   };
   license: LicenseResponseJsonApi;
-  identifiers: IdentifiersEmbedJsonApiResponse;
+  identifiers: {
+    data: {
+      id: string;
+      type: string;
+      attributes: {
+        category: string;
+        value: string;
+      };
+    }[];
+  };
 }
 
 export interface PreprintMetaJsonApi {
diff --git a/src/app/features/preprints/models/preprint.models.ts b/src/app/features/preprints/models/preprint.models.ts
@@ -1,7 +1,7 @@
+import { ProjectIdentifiers } from '@osf/features/project/overview/models';
 import { UserPermissions } from '@osf/shared/enums';
 import { BooleanOrNull, StringOrNull } from '@osf/shared/helpers';
 import { IdName, License, LicenseOptions } from '@osf/shared/models';
-import { Identifier } from '@shared/models/identifiers/indentifier.model';
 
 import { ApplicabilityStatus, PreregLinkInfo, ReviewsState } from '../enums';
 
@@ -44,7 +44,7 @@ export interface Preprint {
   embeddedLicense?: License;
   preprintDoiLink?: string;
   articleDoiLink?: string;
-  identifiers?: Identifier[];
+  identifiers?: ProjectIdentifiers[];
 }
 
 export interface PreprintFilesLinks {
diff --git a/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts b/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts
@@ -45,10 +45,10 @@ import {
 } from '@osf/features/preprints/store/preprint';
 import { GetPreprintProviderById, PreprintProvidersSelectors } from '@osf/features/preprints/store/preprint-providers';
 import { CreateNewVersion, PreprintStepperSelectors } from '@osf/features/preprints/store/preprint-stepper';
+import { ProjectIdentifiers } from '@osf/features/project/overview/models';
 import { IS_MEDIUM, pathJoin } from '@osf/shared/helpers';
 import { DataciteTrackerComponent } from '@shared/components/datacite-tracker/datacite-tracker.component';
 import { ReviewPermissions, UserPermissions } from '@shared/enums';
-import { Identifier } from '@shared/models';
 import { MetaTagsService } from '@shared/services';
 import { ContributorsSelectors } from '@shared/stores';
 
@@ -291,7 +291,7 @@ export class PreprintDetailsComponent extends DataciteTrackerComponent implement
     this.actions.resetState();
   }
 
-  protected override get trackable(): Observable<{ identifiers?: Identifier[] } | null> {
+  protected override get trackable(): Observable<{ identifiers?: ProjectIdentifiers[] } | null> {
     return this.preprint$;
   }
 
diff --git a/src/app/features/project/overview/mappers/project-overview.mapper.ts b/src/app/features/project/overview/mappers/project-overview.mapper.ts
@@ -1,5 +1,4 @@
 import { InstitutionsMapper } from '@shared/mappers';
-import { IdentifiersMapper } from '@shared/mappers/identifiers.mapper';
 import { License } from '@shared/models';
 
 import { ProjectOverview, ProjectOverviewGetResponseJsoApi } from '../models';
@@ -47,7 +46,12 @@ export class ProjectOverviewMapper {
         type: contributor.embeds.users.data.type,
       })),
       affiliatedInstitutions: InstitutionsMapper.fromInstitutionsResponse(response.embeds.affiliated_institutions),
-      identifiers: IdentifiersMapper.fromEmbeds(response.embeds.identifiers),
+      identifiers: response.embeds.identifiers?.data.map((identifier) => ({
+        id: identifier.id,
+        type: identifier.type,
+        value: identifier.attributes.value,
+        category: identifier.attributes.category,
+      })),
       ...(response.embeds.storage?.data &&
         !response.embeds.storage?.errors && {
           storage: {
diff --git a/src/app/features/project/overview/models/project-overview.models.ts b/src/app/features/project/overview/models/project-overview.models.ts
@@ -1,6 +1,5 @@
 import { UserPermissions } from '@osf/shared/enums';
-import { Identifier, Institution, InstitutionsJsonApiResponse, JsonApiResponse, License } from '@osf/shared/models';
-import { IdentifiersEmbedJsonApiResponse } from '@shared/models/identifiers/identifier-json-api';
+import { Institution, InstitutionsJsonApiResponse, JsonApiResponse, License } from '@osf/shared/models';
 
 export interface ProjectOverviewContributor {
   familyName: string;
@@ -39,7 +38,7 @@ export interface ProjectOverview {
     storageLimitStatus: string;
     storageUsage: string;
   };
-  identifiers?: Identifier[];
+  identifiers?: ProjectIdentifiers[];
   supplements?: ProjectSupplements[];
   analyticsKey: string;
   currentUserCanComment: boolean;
@@ -101,7 +100,16 @@ export interface ProjectOverviewGetResponseJsoApi {
   };
   embeds: {
     affiliated_institutions: InstitutionsJsonApiResponse;
-    identifiers: IdentifiersEmbedJsonApiResponse;
+    identifiers: {
+      data: {
+        id: string;
+        type: string;
+        attributes: {
+          category: string;
+          value: string;
+        };
+      }[];
+    };
     bibliographic_contributors: {
       data: {
         embeds: {
@@ -200,6 +208,13 @@ export interface ProjectOverviewResponseJsonApi extends JsonApiResponse<ProjectO
   data: ProjectOverviewGetResponseJsoApi;
 }
 
+export interface ProjectIdentifiers {
+  id: string;
+  type: string;
+  category: string;
+  value: string;
+}
+
 export interface ProjectSupplements {
   id: string;
   type: string;
diff --git a/src/app/features/project/overview/project-overview.component.ts b/src/app/features/project/overview/project-overview.component.ts
@@ -25,6 +25,7 @@ import { FormsModule } from '@angular/forms';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 
 import { SubmissionReviewStatus } from '@osf/features/moderation/enums';
+import { ProjectIdentifiers } from '@osf/features/project/overview/models';
 import { IS_XSMALL } from '@osf/shared/helpers';
 import {
   LoadingSpinnerComponent,
@@ -35,7 +36,6 @@ import {
 import { DataciteTrackerComponent } from '@shared/components/datacite-tracker/datacite-tracker.component';
 import { Mode, ResourceType, UserPermissions } from '@shared/enums';
 import { MapProjectOverview } from '@shared/mappers/resource-overview.mappers';
-import { Identifier } from '@shared/models';
 import { ToastService } from '@shared/services';
 import {
   ClearWiki,
@@ -192,7 +192,7 @@ export class ProjectOverviewComponent extends DataciteTrackerComponent implement
     return null;
   });
 
-  protected override get trackable(): Observable<{ identifiers?: Identifier[] } | null> {
+  protected override get trackable(): Observable<{ identifiers?: ProjectIdentifiers[] } | null> {
     return this.currentProject$;
   }
 
diff --git a/src/app/features/registry/mappers/registry-overview.mapper.ts b/src/app/features/registry/mappers/registry-overview.mapper.ts
@@ -1,7 +1,6 @@
 import { RegistryOverview, RegistryOverviewJsonApiData } from '@osf/features/registry/models';
 import { ReviewPermissionsMapper } from '@osf/shared/mappers';
 import { RegistrationMapper } from '@osf/shared/mappers/registration';
-import { IdentifiersMapper } from '@shared/mappers/identifiers.mapper';
 import { MapRegistryStatus } from '@shared/mappers/registry/map-registry-status.mapper';
 
 export function MapRegistryOverview(data: RegistryOverviewJsonApiData): RegistryOverview | null {
@@ -37,7 +36,12 @@ export function MapRegistryOverview(data: RegistryOverviewJsonApiData): Registry
       middleName: contributor?.embeds?.users?.data?.attributes?.middle_names,
       type: contributor?.embeds?.users?.data?.type,
     })),
-    identifiers: IdentifiersMapper.fromEmbeds(data.embeds.identifiers),
+    identifiers: data.embeds.identifiers?.data.map((identifier) => ({
+      id: identifier.id,
+      type: identifier.type,
+      value: identifier.attributes.value,
+      category: identifier.attributes.category,
+    })),
     analyticsKey: data.attributes?.analyticsKey,
     currentUserCanComment: data.attributes.current_user_can_comment,
     currentUserPermissions: data.attributes.current_user_permissions,
diff --git a/src/app/features/registry/models/get-registry-overview-json-api.model.ts b/src/app/features/registry/models/get-registry-overview-json-api.model.ts
@@ -1,6 +1,5 @@
 import { RegistrationReviewStates, RevisionReviewStates } from '@osf/shared/enums';
 import { ApiData, JsonApiResponse, ProviderDataJsonApi, SchemaResponseDataJsonApi } from '@osf/shared/models';
-import { IdentifiersEmbedJsonApiResponse } from '@shared/models/identifiers/identifier-json-api';
 
 export type GetRegistryOverviewJsonApi = JsonApiResponse<RegistryOverviewJsonApiData, null>;
 
@@ -88,7 +87,16 @@ export interface RegistryOverviewJsonApiEmbed {
       };
     };
   };
-  identifiers: IdentifiersEmbedJsonApiResponse;
+  identifiers: {
+    data: {
+      id: string;
+      type: string;
+      attributes: {
+        category: string;
+        value: string;
+      };
+    }[];
+  };
   schema_responses: {
     data: SchemaResponseDataJsonApi[];
   };
diff --git a/src/app/features/registry/registry.component.ts b/src/app/features/registry/registry.component.ts
@@ -7,10 +7,10 @@ import { ChangeDetectionStrategy, Component, effect, HostBinding, inject } from
 import { toObservable } from '@angular/core/rxjs-interop';
 import { RouterOutlet } from '@angular/router';
 
+import { ProjectIdentifiers } from '@osf/features/project/overview/models';
 import { pathJoin } from '@osf/shared/helpers';
 import { MetaTagsService } from '@osf/shared/services';
 import { DataciteTrackerComponent } from '@shared/components/datacite-tracker/datacite-tracker.component';
-import { Identifier } from '@shared/models';
 
 import { RegistryOverviewSelectors } from './store/registry-overview';
 
@@ -43,7 +43,7 @@ export class RegistryComponent extends DataciteTrackerComponent {
     this.setupDataciteViewTrackerEffect().subscribe();
   }
 
-  protected override get trackable(): Observable<{ identifiers?: Identifier[] } | null> {
+  protected override get trackable(): Observable<{ identifiers?: ProjectIdentifiers[] } | null> {
     return this.registry$;
   }
 
diff --git a/src/app/shared/components/datacite-tracker/datacite-tracker.component.ts b/src/app/shared/components/datacite-tracker/datacite-tracker.component.ts
@@ -2,7 +2,7 @@ import { filter, map, Observable, switchMap, take } from 'rxjs';
 
 import { inject, Injectable } from '@angular/core';
 
-import { Identifier } from '@shared/models';
+import { ProjectIdentifiers } from '@osf/features/project/overview/models';
 import { DataciteService } from '@shared/services/datacite/datacite.service';
 
 @Injectable()
@@ -15,7 +15,7 @@ export abstract class DataciteTrackerComponent {
    *
    * @returns An Observable that emits an item which may contain DOI identifier or null .
    */
-  protected abstract get trackable(): Observable<{ identifiers?: Identifier[] } | null>;
+  protected abstract get trackable(): Observable<{ identifiers?: ProjectIdentifiers[] } | null>;
 
   /**
    * Sets up a one-time effect to log a "view" event to Datacite for the resource DOI.
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.spec.ts b/src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.spec.ts
@@ -1,15 +1,15 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { ProjectIdentifiers } from '@osf/features/project/overview/models';
 import { MOCK_PROJECT_IDENTIFIERS, TranslateServiceMock } from '@shared/mocks';
-import { Identifier } from '@shared/models';
 
 import { ProjectMetadataPublicationDoiComponent } from './project-metadata-publication-doi.component';
 
 describe('ProjectMetadataPublicationDoiComponent', () => {
   let component: ProjectMetadataPublicationDoiComponent;
   let fixture: ComponentFixture<ProjectMetadataPublicationDoiComponent>;
 
-  const mockIdentifiers: Identifier = MOCK_PROJECT_IDENTIFIERS;
+  const mockIdentifiers: ProjectIdentifiers = MOCK_PROJECT_IDENTIFIERS;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts
@@ -5,7 +5,7 @@ import { Card } from 'primeng/card';
 
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
-import { Identifier } from '@osf/shared/models';
+import { ProjectIdentifiers } from '@osf/features/project/overview/models';
 
 @Component({
   selector: 'osf-project-metadata-publication-doi',
@@ -16,6 +16,6 @@ import { Identifier } from '@osf/shared/models';
 export class ProjectMetadataPublicationDoiComponent {
   openEditPublicationDoiDialog = output<void>();
 
-  identifiers = input<Identifier[]>([]);
+  identifiers = input<ProjectIdentifiers[]>([]);
   hideEditDoi = input<boolean>(false);
 }
diff --git a/src/app/shared/mappers/identifiers.mapper.ts b/src/app/shared/mappers/identifiers.mapper.ts
diff --git a/src/app/shared/models/identifiers/identifier-json-api.ts b/src/app/shared/models/identifiers/identifier-json-api.ts
diff --git a/src/app/shared/models/identifiers/indentifier.model.ts b/src/app/shared/models/identifiers/indentifier.model.ts
diff --git a/src/app/shared/models/identifiers/index.ts b/src/app/shared/models/identifiers/index.ts
diff --git a/src/app/shared/models/index.ts b/src/app/shared/models/index.ts
@@ -17,7 +17,6 @@ export * from './filter-labels.model';
 export * from './filters';
 export * from './google-drive-folder.model';
 export * from './guid-response-json-api.model';
-export * from './identifiers';
 export * from './institutions';
 export * from './language-code.model';
 export * from './license';
