[DURACOM-326] fix possible issue on missing value for eperson patch

(cherry picked from commit 7b9cd73ee0)
This commit is contained in:
FrancescoMolinaro
2025-04-30 14:51:42 +02:00
committed by github-actions[bot]
parent d95974a042
commit d02c06d8db
3 changed files with 74 additions and 1 deletions

View File

@@ -31,6 +31,7 @@ import {
import {
EPersonMock,
EPersonMock2,
EPersonMockWithNoName,
} from '../../shared/testing/eperson.mock';
import { GroupMock } from '../../shared/testing/group-mock';
import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
@@ -280,6 +281,37 @@ describe('EPersonDataService', () => {
});
});
describe('updateEPerson with non existing metadata', () => {
beforeEach(() => {
spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(EPersonMockWithNoName));
});
describe('add name that was not previously set', () => {
beforeEach(() => {
const changedEPerson = Object.assign(new EPerson(), {
id: EPersonMock.id,
metadata: Object.assign(EPersonMock.metadata, {
'eperson.firstname': [
{
language: null,
value: 'User',
},
],
}),
email: EPersonMock.email,
canLogIn: EPersonMock.canLogIn,
requireCertificate: EPersonMock.requireCertificate,
_links: EPersonMock._links,
});
service.updateEPerson(changedEPerson).subscribe();
});
it('should send PatchRequest with add email operation', () => {
const operations = [{ op: 'add', path: '/eperson.firstname', value: [{ language: null, value: 'User' }] }];
const expected = new PatchRequest(requestService.generateRequestId(), epersonsEndpoint + '/' + EPersonMock.uuid, operations);
expect(requestService.send).toHaveBeenCalledWith(expected);
});
});
});
describe('clearEPersonRequests', () => {
beforeEach(() => {
spyOn(halService, 'getEndpoint').and.callFake((linkPath: string) => {

View File

@@ -269,7 +269,8 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
* @param newEPerson
*/
private generateOperations(oldEPerson: EPerson, newEPerson: EPerson): Operation[] {
let operations = this.comparator.diff(oldEPerson, newEPerson).filter((operation: Operation) => operation.op === 'replace');
let operations = this.comparator.diff(oldEPerson, newEPerson)
.filter((operation: Operation) => ['replace', 'add'].includes(operation.op));
if (hasValue(oldEPerson.email) && oldEPerson.email !== newEPerson.email) {
operations = [...operations, {
op: 'replace', path: '/email', value: newEPerson.email,

View File

@@ -91,3 +91,43 @@ export const EPersonMock2: EPerson = Object.assign(new EPerson(), {
],
},
});
export const EPersonMockWithNoName: EPerson = Object.assign(new EPerson(), {
handle: null,
groups: [],
netid: 'test@test.com',
lastActive: '2018-05-14T12:25:42.411+0000',
canLogIn: true,
email: 'test@test.com',
requireCertificate: false,
selfRegistered: false,
_links: {
self: {
href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid',
},
groups: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid/groups' },
},
id: 'testid',
uuid: 'testid',
type: 'eperson',
metadata: {
'dc.title': [
{
language: null,
value: 'User Test',
},
],
'eperson.lastname': [
{
language: null,
value: 'Test',
},
],
'eperson.language': [
{
language: null,
value: 'en',
},
],
},
});