introduce-partner-business-role #16

Merged
hsh-michaelhoennig merged 33 commits from introduce-partner-business-role into master 2024-02-01 14:48:16 +01:00
4 changed files with 8 additions and 7 deletions
Showing only changes of commit 82573d1c9f - Show all commits

View File

@ -54,8 +54,8 @@ public class HsOfficeRelationshipEntity implements HasUuid, Stringifyable {
@Enumerated(EnumType.STRING)
private HsOfficeRelationshipType relType;
@Column(name = "reltypemark")
private String relTypeMark;
@Column(name = "relmark")
private String relMark;
@Override
public String toString() {

View File

@ -26,7 +26,7 @@ components:
$ref: './hs-office-person-schemas.yaml#/components/schemas/HsOfficePerson'
relType:
type: string
relTypeMark:
relMark:
type: string
nullable: true
contact:
@ -51,9 +51,9 @@ components:
format: uuid
relType:
type: string
relTypeMark:
type: string
nullable: true
relMark:
type: string
contactUuid:
type: string
format: uuid

View File

@ -22,7 +22,7 @@ create table if not exists hs_office_relationship
relHolderUuid uuid not null references hs_office_person(uuid),
contactUuid uuid references hs_office_contact(uuid),
relType HsOfficeRelationshipType not null,
relTypeMark varchar(24)
relMark varchar(24)
);
--//

View File

@ -761,7 +761,8 @@ public class ImportOfficeData extends ContextBasedTest {
for (String subscriberRole: SUBSCRIBER_ROLES) {
if (containsRole(rec, subscriberRole)) {
addRelationship(partnerPerson, contactPerson, contact, HsOfficeRelationshipType.SUBSCRIBER)
.setRelTypeMark(subscriberRole.split(":")[1]);
.setRelMark(subscriberRole.split(":")[1])
;
}
}
verifyContainsOnlyKnownRoles(rec.getString("roles"));