Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion src/published-data/published-data.v4.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
Get,
HttpException,
HttpStatus,
Logger,
NotFoundException,
Param,
Patch,
Expand All @@ -26,6 +27,7 @@ import {
} from "@nestjs/swagger";
import { Request } from "express";
import { Validator } from "jsonschema";
import { cloneDeep, isArray } from "lodash";
import { FilterQuery, QueryOptions } from "mongoose";
import { firstValueFrom } from "rxjs";
import { AttachmentsService } from "src/attachments/attachments.service";
Expand Down Expand Up @@ -576,6 +578,7 @@ export class PublishedDataV4Controller {
publishedData.status = data.status;

await this.validateMetadata(publishedData.metadata);
await this.tryAddDateIssued(publishedData, publishedData.registeredTime);

await Promise.all(
publishedData.datasetPids.map(async (pid) => {
Expand Down Expand Up @@ -633,7 +636,11 @@ export class PublishedDataV4Controller {

const res = await this.publishedDataService.update(
{ doi: publishedData.doi },
{ status: PublishedDataStatus.REGISTERED, registeredTime: new Date() },
{
status: PublishedDataStatus.REGISTERED,
registeredTime: publishedData.registeredTime,
metadata: publishedData.metadata,
},
);

return res;
Expand Down Expand Up @@ -783,4 +790,30 @@ export class PublishedDataV4Controller {

return registrationData;
}

private async tryAddDateIssued(
publishedData: PublishedData,
registeredTime: Date,
) {
const originalMetadata = cloneDeep(publishedData.metadata);
try {
if (!publishedData.metadata) publishedData.metadata = {};
publishedData.metadata.dates = publishedData.metadata.dates ?? [];

if (
isArray(publishedData.metadata.dates) &&
!publishedData.metadata.dates.some((d) => d.dateType === "Issued")
) {
publishedData.metadata.dates.push({
date: registeredTime.toISOString(),
dateType: "Issued",
});
}
await this.validateMetadata(publishedData.metadata);
} catch (validationError) {
// Restore original metadata if schema doesn't support DataCite dates
publishedData.metadata = originalMetadata;
Logger.warn(validationError, "failed to add data issued to metadata");
}
}
}
8 changes: 8 additions & 0 deletions test/jest-e2e-tests/publishedData.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ describe.each([undefined, "", "https://api.test.datacite.org/dois"])(
.then((res) => {
expect(res.body.status).toEqual("registered");
expect(res.body.registeredTime).toBeDefined();
expect(res.body.metadata.dates).toBeDefined();
expect(Array.isArray(res.body.metadata.dates)).toBe(true);
expect(res.body.metadata.dates.length).toBe(1);
const issuedDate = res.body.metadata.dates.filter(
(d: { dateType: string }) => d.dateType === "Issued",
);
expect(issuedDate.length).toBe(1);
expect(issuedDate[0].date).toEqual(res.body.registeredTime);
});
});

Expand Down
Loading