import title and salutation for person
This commit is contained in:
commit
5f6e4da28d
@ -77,7 +77,6 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
|
||||
|
||||
@Override
|
||||
@Transactional(readOnly = true)
|
||||
|
||||
public ResponseEntity<HsOfficeCoopAssetsTransactionResource> getCoopAssetTransactionByUuid(
|
||||
final String currentSubject, final String assumedRoles, final UUID assetTransactionUuid) {
|
||||
|
||||
|
@ -34,8 +34,8 @@ public class HsOfficeMembershipController implements HsOfficeMembershipsApi {
|
||||
public ResponseEntity<List<HsOfficeMembershipResource>> listMemberships(
|
||||
final String currentSubject,
|
||||
final String assumedRoles,
|
||||
UUID partnerUuid,
|
||||
Integer memberNumber) {
|
||||
final UUID partnerUuid,
|
||||
final Integer memberNumber) {
|
||||
context.define(currentSubject, assumedRoles);
|
||||
|
||||
final var entities = ( memberNumber != null)
|
||||
|
@ -52,11 +52,11 @@ components:
|
||||
HsBookingItemInsert:
|
||||
type: object
|
||||
properties:
|
||||
projectUuid:
|
||||
project.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: false
|
||||
parentItemUuid:
|
||||
parentItem.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: false
|
||||
@ -77,7 +77,7 @@ components:
|
||||
$ref: '../hs-hosting/hs-hosting-asset-schemas.yaml#/components/schemas/HsHostingAssetAutoInsert'
|
||||
required:
|
||||
- caption
|
||||
- projectUuid
|
||||
- project.uuid
|
||||
- validFrom
|
||||
- resources
|
||||
additionalProperties: false
|
||||
|
@ -25,7 +25,7 @@ components:
|
||||
HsBookingProjectInsert:
|
||||
type: object
|
||||
properties:
|
||||
debitorUuid:
|
||||
debitor.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: false
|
||||
@ -35,6 +35,6 @@ components:
|
||||
maxLength: 80
|
||||
nullable: false
|
||||
required:
|
||||
- debitorUuid
|
||||
- debitor.uuid
|
||||
- caption
|
||||
additionalProperties: false
|
||||
|
@ -54,7 +54,7 @@ components:
|
||||
caption:
|
||||
type: string
|
||||
nullable: true
|
||||
alarmContactUuid:
|
||||
alarmContact.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: true
|
||||
@ -64,11 +64,11 @@ components:
|
||||
HsHostingAssetInsert:
|
||||
type: object
|
||||
properties:
|
||||
bookingItemUuid:
|
||||
bookingItem.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: true
|
||||
parentAssetUuid:
|
||||
parentAsset.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: true
|
||||
@ -84,7 +84,7 @@ components:
|
||||
minLength: 3
|
||||
maxLength: 80
|
||||
nullable: false
|
||||
alarmContactUuid:
|
||||
alarmContact.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: true
|
||||
@ -99,11 +99,11 @@ components:
|
||||
HsHostingAssetAutoInsert:
|
||||
type: object
|
||||
properties:
|
||||
parentAssetUuid:
|
||||
parentAsset.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: true
|
||||
assignedToAssetUuid:
|
||||
assignedToAsset.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
type:
|
||||
@ -118,7 +118,7 @@ components:
|
||||
minLength: 3
|
||||
maxLength: 80
|
||||
nullable: false
|
||||
alarmContactUuid:
|
||||
alarmContact.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: true
|
||||
@ -147,10 +147,10 @@ components:
|
||||
minLength: 3
|
||||
maxLength: 80
|
||||
nullable: false
|
||||
assignedToAssetUuid:
|
||||
assignedToAsset.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
alarmContactUuid:
|
||||
alarmContact.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: true
|
||||
|
@ -62,7 +62,7 @@ components:
|
||||
HsOfficeCoopAssetsTransactionInsert:
|
||||
type: object
|
||||
properties:
|
||||
membershipUuid:
|
||||
membership.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: false
|
||||
@ -80,11 +80,11 @@ components:
|
||||
maxLength: 48
|
||||
comment:
|
||||
type: string
|
||||
reverseEntryUuid:
|
||||
reverseEntry.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
required:
|
||||
- membershipUuid
|
||||
- membership.uuid
|
||||
- transactionType
|
||||
- assetValue
|
||||
- valueDate
|
||||
|
@ -56,7 +56,7 @@ components:
|
||||
HsOfficeCoopSharesTransactionInsert:
|
||||
type: object
|
||||
properties:
|
||||
membershipUuid:
|
||||
membership.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: false
|
||||
@ -73,11 +73,11 @@ components:
|
||||
maxLength: 48
|
||||
comment:
|
||||
type: string
|
||||
adjustedShareTxUuid:
|
||||
adjustedShareTx.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
required:
|
||||
- membershipUuid
|
||||
- membership.uuid
|
||||
- transactionType
|
||||
- shareCount
|
||||
- valueDate
|
||||
|
@ -41,7 +41,7 @@ components:
|
||||
HsOfficeDebitorPatch:
|
||||
type: object
|
||||
properties:
|
||||
debitorRelUuid:
|
||||
debitorRel.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: true
|
||||
@ -61,7 +61,7 @@ components:
|
||||
vatReverseCharge:
|
||||
type: boolean
|
||||
nullable: false
|
||||
refundBankAccountUuid:
|
||||
refundBankAccount.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: true
|
||||
@ -75,7 +75,7 @@ components:
|
||||
properties:
|
||||
debitorRel:
|
||||
$ref: 'hs-office-relation-schemas.yaml#/components/schemas/HsOfficeRelationSubInsert'
|
||||
debitorRelUuid:
|
||||
debitorRel.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
debitorNumberSuffix:
|
||||
@ -92,7 +92,7 @@ components:
|
||||
type: boolean
|
||||
vatReverseCharge:
|
||||
type: boolean
|
||||
refundBankAccountUuid:
|
||||
refundBankAccount.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
defaultPrefix:
|
||||
|
@ -62,7 +62,7 @@ components:
|
||||
HsOfficeMembershipInsert:
|
||||
type: object
|
||||
properties:
|
||||
partnerUuid:
|
||||
partner.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: false
|
||||
@ -86,7 +86,7 @@ components:
|
||||
nullable: false
|
||||
type: boolean
|
||||
required:
|
||||
- partnerUuid
|
||||
- partner.uuid
|
||||
- memberNumberSuffix
|
||||
- validFrom
|
||||
- membershipFeeBillable
|
||||
|
@ -50,7 +50,7 @@ components:
|
||||
HsOfficePartnerPatch:
|
||||
type: object
|
||||
properties:
|
||||
partnerRelUuid:
|
||||
partnerRel.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: true
|
||||
@ -103,19 +103,19 @@ components:
|
||||
type: object
|
||||
nullable: false
|
||||
properties:
|
||||
anchorUuid:
|
||||
anchor.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
holderUuid:
|
||||
holder.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
contactUuid:
|
||||
contact.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
required:
|
||||
- anchorUuid
|
||||
- holderUuid
|
||||
- relContactUuid
|
||||
- anchor.uuid
|
||||
- holder.uuid
|
||||
- relContact.uuid
|
||||
|
||||
HsOfficePartnerDetailsInsert:
|
||||
type: object
|
||||
|
@ -37,7 +37,7 @@ components:
|
||||
HsOfficeRelationPatch:
|
||||
type: object
|
||||
properties:
|
||||
contactUuid:
|
||||
contact.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: true
|
||||
@ -46,10 +46,10 @@ components:
|
||||
HsOfficeRelationInsert:
|
||||
type: object
|
||||
properties:
|
||||
anchorUuid:
|
||||
anchor.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
holderUuid:
|
||||
holder.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
type:
|
||||
@ -58,32 +58,32 @@ components:
|
||||
mark:
|
||||
type: string
|
||||
nullable: true
|
||||
contactUuid:
|
||||
contact.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
required:
|
||||
- anchorUuid
|
||||
- holderUuid
|
||||
- anchor.uuid
|
||||
- holder.uuid
|
||||
- type
|
||||
- contactUuid
|
||||
- contact.uuid
|
||||
|
||||
# relation created as a sub-element with implicitly known type
|
||||
HsOfficeRelationSubInsert:
|
||||
type: object
|
||||
properties:
|
||||
anchorUuid:
|
||||
anchor.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
holderUuid:
|
||||
holder.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
mark:
|
||||
type: string
|
||||
nullable: true
|
||||
contactUuid:
|
||||
contact.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
required:
|
||||
- anchorUuid
|
||||
- holderUuid
|
||||
- contactUuid
|
||||
- anchor.uuid
|
||||
- holder.uuid
|
||||
- contact.uuid
|
||||
|
@ -48,11 +48,11 @@ components:
|
||||
HsOfficeSepaMandateInsert:
|
||||
type: object
|
||||
properties:
|
||||
debitorUuid:
|
||||
debitor.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: false
|
||||
bankAccountUuid:
|
||||
bankAccount.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
nullable: false
|
||||
@ -72,8 +72,8 @@ components:
|
||||
format: date
|
||||
nullable: true
|
||||
required:
|
||||
- debitorUuid
|
||||
- bankAccountUuid
|
||||
- debitor.uuid
|
||||
- bankAccount.uuid
|
||||
- reference
|
||||
- agreement
|
||||
- validFrom
|
||||
|
@ -8,21 +8,21 @@ components:
|
||||
properties:
|
||||
grantedByRoleIdName:
|
||||
type: string
|
||||
grantedByRoleUuid:
|
||||
grantedByRole.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
assumed:
|
||||
type: boolean
|
||||
grantedRoleIdName:
|
||||
type: string
|
||||
grantedRoleUuid:
|
||||
grantedRole.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
granteeSubjectName:
|
||||
type: string
|
||||
granteeSubjectUuid:
|
||||
granteeSubject.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
required:
|
||||
- grantedRoleUuid
|
||||
- granteeSubjectUuid
|
||||
- grantedRole.uuid
|
||||
- granteeSubject.uuid
|
||||
|
@ -9,7 +9,7 @@ components:
|
||||
uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
objectUuid:
|
||||
object.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
objectTable:
|
||||
|
@ -14,7 +14,7 @@ components:
|
||||
RbacSubjectPermission:
|
||||
type: object
|
||||
properties:
|
||||
objectUuid:
|
||||
object.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
objectTable:
|
||||
@ -23,10 +23,10 @@ components:
|
||||
type: string
|
||||
roleName:
|
||||
type: string
|
||||
roleUuid:
|
||||
role.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
permissionUuid:
|
||||
permission.uuid:
|
||||
type: string
|
||||
format: uuid
|
||||
op:
|
||||
|
@ -150,7 +150,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"projectUuid": "{projectUuid}",
|
||||
"project.uuid": "{projectUuid}",
|
||||
"type": "MANAGED_SERVER",
|
||||
"caption": "some new booking",
|
||||
"validTo": "{validTo}",
|
||||
@ -200,8 +200,8 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"projectUuid": "{projectUuid}",
|
||||
"parentItemUuid": "{managedServerUuid}",
|
||||
"project.uuid": "{projectUuid}",
|
||||
"parentItem.uuid": "{managedServerUuid}",
|
||||
"type": "MANAGED_WEBSPACE",
|
||||
"caption": "some managed webspace",
|
||||
"resources": {
|
||||
@ -270,7 +270,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"projectUuid": "{projectUuid}",
|
||||
"project.uuid": "{projectUuid}",
|
||||
"type": "DOMAIN_SETUP",
|
||||
"caption": "Domain-Setup for example.org",
|
||||
"resources": {
|
||||
@ -285,7 +285,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN_HTTP_SETUP",
|
||||
"assignedToAssetUuid": "{unixUserUuid}"
|
||||
"assignedToAsset.uuid": "{unixUserUuid}"
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN_MBOX_SETUP"
|
||||
@ -360,7 +360,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"projectUuid": "{projectUuid}",
|
||||
"project.uuid": "{projectUuid}",
|
||||
"type": "DOMAIN_SETUP",
|
||||
"caption": "some new domain-setup booking",
|
||||
"resources": {
|
||||
@ -375,7 +375,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN_HTTP_SETUP",
|
||||
"assignedToAssetUuid": "{unixUserUuid}"
|
||||
"assignedToAsset.uuid": "{unixUserUuid}"
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN_MBOX_SETUP"
|
||||
|
@ -105,7 +105,7 @@ class HsBookingItemControllerRestTest {
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content("""
|
||||
{
|
||||
"projectUuid": "{projectUuid}",
|
||||
"project.uuid": "{projectUuid}",
|
||||
"type": "MANAGED_SERVER",
|
||||
"caption": "some new booking",
|
||||
"validTo": "{validTo}",
|
||||
@ -155,7 +155,7 @@ class HsBookingItemControllerRestTest {
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content("""
|
||||
{
|
||||
"projectUuid": "{projectUuid}",
|
||||
"project.uuid": "{projectUuid}",
|
||||
"type": "MANAGED_SERVER",
|
||||
"caption": "some new booking",
|
||||
"validFrom": "{validFrom}",
|
||||
|
@ -92,7 +92,7 @@ class HsBookingProjectControllerAcceptanceTest extends ContextBasedTestWithClean
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"debitorUuid": "%s",
|
||||
"debitor.uuid": "%s",
|
||||
"caption": "some new project"
|
||||
}
|
||||
""".formatted(givenDebitor.getUuid()))
|
||||
|
@ -165,10 +165,10 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"bookingItemUuid": "%s",
|
||||
"bookingItem.uuid": "%s",
|
||||
"type": "MANAGED_WEBSPACE",
|
||||
"identifier": "fir10",
|
||||
"parentAssetUuid": "%s",
|
||||
"parentAsset.uuid": "%s",
|
||||
"caption": "some separate ManagedWebspace HA",
|
||||
"config": {}
|
||||
}
|
||||
@ -227,7 +227,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"parentAssetUuid": "%s",
|
||||
"parentAsset.uuid": "%s",
|
||||
"type": "UNIX_USER",
|
||||
"identifier": "fir01-temp",
|
||||
"caption": "some new UnixUser in client's ManagedWebspace",
|
||||
@ -280,7 +280,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"bookingItemUuid": "%s",
|
||||
"bookingItem.uuid": "%s",
|
||||
"type": "DOMAIN_SETUP",
|
||||
"identifier": "example.com",
|
||||
"caption": "some unrelated domain-setup",
|
||||
@ -326,7 +326,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"bookingItemUuid": "%s",
|
||||
"bookingItem.uuid": "%s",
|
||||
"type": "MANAGED_SERVER",
|
||||
"identifier": "vm1400",
|
||||
"caption": "some new ManagedServer",
|
||||
@ -381,7 +381,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"parentAssetUuid": "%s",
|
||||
"parentAsset.uuid": "%s",
|
||||
"type": "UNIX_USER",
|
||||
"identifier": "fir01-extra",
|
||||
"caption": "some extra UnixUser",
|
||||
@ -508,7 +508,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"alarmContactUuid": "%s",
|
||||
"alarmContact.uuid": "%s",
|
||||
"config": {
|
||||
"monit_max_ssd_usage": 85,
|
||||
"monit_max_hdd_usage": null,
|
||||
|
@ -83,7 +83,7 @@ class DomainSetupHostingAssetFactoryUnitTest {
|
||||
"subHostingAssets": [
|
||||
{
|
||||
"type": "DOMAIN_HTTP_SETUP",
|
||||
"assignedToAssetUuid": "{unixUserHostingAssetUuid}"
|
||||
"assignedToAsset.uuid": "{unixUserHostingAssetUuid}"
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN_DNS_SETUP"
|
||||
@ -124,7 +124,7 @@ class DomainSetupHostingAssetFactoryUnitTest {
|
||||
"subHostingAssets": [
|
||||
{
|
||||
"type": "DOMAIN_HTTP_SETUP",
|
||||
"assignedToAssetUuid": "{unixUserHostingAssetUuid}"
|
||||
"assignedToAsset.uuid": "{unixUserHostingAssetUuid}"
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN_DNS_SETUP"
|
||||
@ -164,7 +164,7 @@ class DomainSetupHostingAssetFactoryUnitTest {
|
||||
"subHostingAssets": [
|
||||
{
|
||||
"type": "DOMAIN_HTTP_SETUP",
|
||||
"assignedToAssetUuid": "{unixUserHostingAssetUuid}"
|
||||
"assignedToAsset.uuid": "{unixUserHostingAssetUuid}"
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN_DNS_SETUP"
|
||||
@ -206,7 +206,7 @@ class DomainSetupHostingAssetFactoryUnitTest {
|
||||
"subHostingAssets": [
|
||||
{
|
||||
"type": "DOMAIN_HTTP_SETUP",
|
||||
"assignedToAssetUuid": "{unixUserHostingAssetUuid}"
|
||||
"assignedToAsset.uuid": "{unixUserHostingAssetUuid}"
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN_DNS_SETUP"
|
||||
|
@ -1065,11 +1065,11 @@ public abstract class BaseOfficeDataImport extends CsvDataImport {
|
||||
}
|
||||
|
||||
private HsOfficePersonEntity addPerson(final HsOfficePersonEntity person, final Record contactRecord) {
|
||||
person.setSalutation(contactRecord.getString("salut").trim());
|
||||
person.setTitle(contactRecord.getString("title").trim());
|
||||
person.setGivenName(contactRecord.getString("first_name").trim());
|
||||
person.setFamilyName(contactRecord.getString("last_name").trim());
|
||||
person.setTradeName(contactRecord.getString("firma").trim());
|
||||
person.setSalutation(contactRecord.getString("salut"));
|
||||
person.setTitle(contactRecord.getString("title"));
|
||||
person.setGivenName(contactRecord.getString("first_name"));
|
||||
person.setFamilyName(contactRecord.getString("last_name"));
|
||||
person.setTradeName(contactRecord.getString("firma"));
|
||||
person.setPersonType(determinePersonType(contactRecord));
|
||||
|
||||
persons.put(contactRecord.getInteger("contact_id"), person);
|
||||
|
@ -180,7 +180,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"membershipUuid": "%s",
|
||||
"membership.uuid": "%s",
|
||||
"transactionType": "DEPOSIT",
|
||||
"assetValue": 1024.00,
|
||||
"valueDate": "2022-10-13",
|
||||
@ -237,13 +237,13 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"membershipUuid": "%s",
|
||||
"membership.uuid": "%s",
|
||||
"transactionType": "ADJUSTMENT",
|
||||
"assetValue": %s,
|
||||
"valueDate": "2022-10-30",
|
||||
"reference": "test ref adjustment",
|
||||
"comment": "some coop assets adjustment transaction",
|
||||
"reverseEntryUuid": "%s"
|
||||
"reverseEntry.uuid": "%s"
|
||||
}
|
||||
""".formatted(
|
||||
givenMembership.getUuid(),
|
||||
@ -270,7 +270,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
|
||||
"reference": "test ref"
|
||||
}
|
||||
}
|
||||
""".formatted(givenTransaction.getUuid())))
|
||||
"""))
|
||||
.header("Location", startsWith("http://localhost"))
|
||||
.extract().header("Location"); // @formatter:on
|
||||
|
||||
@ -293,14 +293,14 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"membershipUuid": "%s",
|
||||
"membership.uuid": "%s",
|
||||
"transactionType": "DISBURSAL",
|
||||
"assetValue": -10240.00,
|
||||
"valueDate": "2022-10-13",
|
||||
"reference": "temp ref X",
|
||||
"comment": "just some test coop assets transaction"
|
||||
}
|
||||
""".formatted(givenMembership.getUuid()))
|
||||
""".formatted(givenMembership.getUuid()))
|
||||
.port(port)
|
||||
.when()
|
||||
.post("http://localhost/api/hs/office/coopassetstransactions")
|
||||
|
@ -37,7 +37,7 @@ class HsOfficeCoopAssetsTransactionControllerRestTest {
|
||||
|
||||
static final String VALID_INSERT_REQUEST_BODY = """
|
||||
{
|
||||
"membershipUuid": "%s",
|
||||
"membership.uuid": "%s",
|
||||
"transactionType": "DEPOSIT",
|
||||
"assetValue": 128.00,
|
||||
"valueDate": "2022-10-13",
|
||||
@ -48,8 +48,8 @@ class HsOfficeCoopAssetsTransactionControllerRestTest {
|
||||
|
||||
enum BadRequestTestCases {
|
||||
MEMBERSHIP_UUID_MISSING(
|
||||
requestBody -> requestBody.without("membershipUuid"),
|
||||
"[membershipUuid must not be null but is \"null\"]"),
|
||||
requestBody -> requestBody.without("membership.uuid"),
|
||||
"[membershipUuid must not be null but is \"null\"]"), // TODO.impl: should be membership.uuid, Spring validation-problem?
|
||||
|
||||
TRANSACTION_TYPE_MISSING(
|
||||
requestBody -> requestBody.without("transactionType"),
|
||||
@ -121,10 +121,10 @@ class HsOfficeCoopAssetsTransactionControllerRestTest {
|
||||
.accept(MediaType.APPLICATION_JSON))
|
||||
|
||||
// then
|
||||
.andExpect(status().is4xxClientError())
|
||||
.andExpect(jsonPath("message", is("ERROR: [400] " + testCase.expectedErrorMessage)))
|
||||
.andExpect(jsonPath("statusCode", is(400)))
|
||||
.andExpect(jsonPath("statusPhrase", is("Bad Request")))
|
||||
.andExpect(jsonPath("message", is("ERROR: [400] " + testCase.expectedErrorMessage)));
|
||||
.andExpect(status().is4xxClientError());
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -168,7 +168,7 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
|
||||
final var location = RestAssured // @formatter:off
|
||||
.given().header("current-subject", "superuser-alex@hostsharing.net").contentType(ContentType.JSON).body("""
|
||||
{
|
||||
"membershipUuid": "%s",
|
||||
"membership.uuid": "%s",
|
||||
"transactionType": "SUBSCRIPTION",
|
||||
"shareCount": 8,
|
||||
"valueDate": "2022-10-13",
|
||||
@ -214,13 +214,13 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"membershipUuid": "%s",
|
||||
"membership.uuid": "%s",
|
||||
"transactionType": "ADJUSTMENT",
|
||||
"shareCount": %s,
|
||||
"valueDate": "2022-10-30",
|
||||
"reference": "test ref adjustment",
|
||||
"comment": "some coop shares adjustment transaction",
|
||||
"adjustedShareTxUuid": "%s"
|
||||
"adjustedShareTx.uuid": "%s"
|
||||
}
|
||||
""".formatted(
|
||||
givenMembership.getUuid(),
|
||||
@ -267,7 +267,7 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
|
||||
RestAssured // @formatter:off
|
||||
.given().header("current-subject", "superuser-alex@hostsharing.net").contentType(ContentType.JSON).body("""
|
||||
{
|
||||
"membershipUuid": "%s",
|
||||
"membership.uuid": "%s",
|
||||
"transactionType": "CANCELLATION",
|
||||
"shareCount": -80,
|
||||
"valueDate": "2022-10-13",
|
||||
|
@ -37,7 +37,7 @@ class HsOfficeCoopSharesTransactionControllerRestTest {
|
||||
|
||||
static final String VALID_INSERT_REQUEST_BODY = """
|
||||
{
|
||||
"membershipUuid": "%s",
|
||||
"membership.uuid": "%s",
|
||||
"transactionType": "SUBSCRIPTION",
|
||||
"shareCount": 8,
|
||||
"valueDate": "2022-10-13",
|
||||
@ -48,7 +48,7 @@ class HsOfficeCoopSharesTransactionControllerRestTest {
|
||||
|
||||
enum BadRequestTestCases {
|
||||
MEMBERSHIP_UUID_MISSING(
|
||||
requestBody -> requestBody.without("membershipUuid"),
|
||||
requestBody -> requestBody.without("membership.uuid"),
|
||||
"[membershipUuid must not be null but is \"null\"]"),
|
||||
|
||||
TRANSACTION_TYPE_MISSING(
|
||||
|
@ -287,14 +287,14 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"debitorRelUuid": "%s",
|
||||
"debitorRel.uuid": "%s",
|
||||
"debitorNumberSuffix": "%s",
|
||||
"billable": "true",
|
||||
"vatId": "VAT123456",
|
||||
"vatCountryCode": "DE",
|
||||
"vatBusiness": true,
|
||||
"vatReverseCharge": "false",
|
||||
"refundBankAccountUuid": "%s",
|
||||
"refundBankAccount.uuid": "%s",
|
||||
"defaultPrefix": "for"
|
||||
}
|
||||
""".formatted( givenDebitorRelUUid, ++nextDebitorSuffix, givenBankAccount.getUuid()))
|
||||
@ -333,9 +333,9 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
|
||||
.body("""
|
||||
{
|
||||
"debitorRel": {
|
||||
"anchorUuid": "%s",
|
||||
"holderUuid": "%s",
|
||||
"contactUuid": "%s"
|
||||
"anchor.uuid": "%s",
|
||||
"holder.uuid": "%s",
|
||||
"contact.uuid": "%s"
|
||||
},
|
||||
"debitorNumberSuffix": "%s",
|
||||
"defaultPrefix": "for",
|
||||
@ -384,9 +384,9 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
|
||||
.body("""
|
||||
{
|
||||
"debitorRel": {
|
||||
"anchorUuid": "%s",
|
||||
"holderUuid": "%s",
|
||||
"contactUuid": "%s"
|
||||
"anchor.uuid": "%s",
|
||||
"holder.uuid": "%s",
|
||||
"contact.uuid": "%s"
|
||||
},
|
||||
"debitorNumberSuffix": "%s",
|
||||
"defaultPrefix": "for",
|
||||
@ -418,7 +418,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"debitorRelUuid": "%s",
|
||||
"debitorRel.uuid": "%s",
|
||||
"debitorNumberSuffix": "%s",
|
||||
"defaultPrefix": "for",
|
||||
"billable": "true",
|
||||
|
@ -182,7 +182,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"partnerUuid": "%s",
|
||||
"partner.uuid": "%s",
|
||||
"memberNumberSuffix": "%s",
|
||||
"validFrom": "2022-10-13",
|
||||
"membershipFeeBillable": "true"
|
||||
|
@ -56,12 +56,12 @@ public class HsOfficeMembershipControllerRestTest {
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content("""
|
||||
{
|
||||
"partnerUuid": null,
|
||||
"partner.uuid": null,
|
||||
"memberNumberSuffix": "01",
|
||||
"validFrom": "2022-10-13",
|
||||
"membershipFeeBillable": "true"
|
||||
}
|
||||
""".formatted(UUID.randomUUID()))
|
||||
""")
|
||||
.accept(MediaType.APPLICATION_JSON))
|
||||
|
||||
// then
|
||||
@ -86,7 +86,7 @@ public class HsOfficeMembershipControllerRestTest {
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content("""
|
||||
{
|
||||
"partnerUuid": "%s",
|
||||
"partner.uuid": "%s",
|
||||
"memberNumberSuffix": "01",
|
||||
"validFrom": "2022-10-13",
|
||||
"membershipFeeBillable": "true"
|
||||
@ -112,7 +112,7 @@ public class HsOfficeMembershipControllerRestTest {
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content("""
|
||||
{
|
||||
"partnerUuid": "%s",
|
||||
"partner.uuid": "%s",
|
||||
%s
|
||||
"validFrom": "2022-10-13",
|
||||
"membershipFeeBillable": "true"
|
||||
|
@ -102,9 +102,9 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
|
||||
{
|
||||
"partnerNumber": "20002",
|
||||
"partnerRel": {
|
||||
"anchorUuid": "%s",
|
||||
"holderUuid": "%s",
|
||||
"contactUuid": "%s"
|
||||
"anchor.uuid": "%s",
|
||||
"holder.uuid": "%s",
|
||||
"contact.uuid": "%s"
|
||||
},
|
||||
"details": {
|
||||
"registrationOffice": "Temp Registergericht Aurich",
|
||||
@ -161,12 +161,12 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
|
||||
{
|
||||
"partnerNumber": "20003",
|
||||
"partnerRel": {
|
||||
"anchorUuid": "%s",
|
||||
"holderUuid": "%s",
|
||||
"contactUuid": "%s"
|
||||
"anchor.uuid": "%s",
|
||||
"holder.uuid": "%s",
|
||||
"contact.uuid": "%s"
|
||||
},
|
||||
"personUuid": "%s",
|
||||
"contactUuid": "%s",
|
||||
"person.uuid": "%s",
|
||||
"contact.uuid": "%s",
|
||||
"details": {}
|
||||
}
|
||||
""".formatted(
|
||||
@ -199,12 +199,12 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
|
||||
{
|
||||
"partnerNumber": "20004",
|
||||
"partnerRel": {
|
||||
"anchorUuid": "%s",
|
||||
"holderUuid": "%s",
|
||||
"contactUuid": "%s"
|
||||
"anchor.uuid": "%s",
|
||||
"holder.uuid": "%s",
|
||||
"contact.uuid": "%s"
|
||||
},
|
||||
"personUuid": "%s",
|
||||
"contactUuid": "%s",
|
||||
"person.uuid": "%s",
|
||||
"contact.uuid": "%s",
|
||||
"details": {}
|
||||
}
|
||||
""".formatted(
|
||||
@ -321,7 +321,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
|
||||
.body("""
|
||||
{
|
||||
"partnerNumber": "20011",
|
||||
"partnerRelUuid": "%s",
|
||||
"partnerRel.uuid": "%s",
|
||||
"details": {
|
||||
"registrationOffice": "Temp Registergericht Aurich",
|
||||
"registrationNumber": "222222",
|
||||
@ -330,7 +330,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
|
||||
"dateOfDeath": "2022-01-12"
|
||||
}
|
||||
}
|
||||
""".formatted(givenPartnerRel.getUuid()))
|
||||
""".formatted(givenPartnerRel.getUuid()))
|
||||
.port(port)
|
||||
.when()
|
||||
.patch("http://localhost/api/hs/office/partners/" + givenPartner.getUuid())
|
||||
@ -387,7 +387,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"partnerRelUuid": "%s"
|
||||
"partnerRel.uuid": "%s"
|
||||
}
|
||||
""".formatted(givenPartnerRel.getUuid()))
|
||||
.port(port)
|
||||
|
@ -101,12 +101,12 @@ class HsOfficePartnerControllerRestTest {
|
||||
{
|
||||
"partnerNumber": "20002",
|
||||
"partnerRel": {
|
||||
"anchorUuid": "%s",
|
||||
"holderUuid": "%s",
|
||||
"contactUuid": "%s"
|
||||
"anchor.uuid": "%s",
|
||||
"holder.uuid": "%s",
|
||||
"contact.uuid": "%s"
|
||||
},
|
||||
"personUuid": "%s",
|
||||
"contactUuid": "%s",
|
||||
"person.uuid": "%s",
|
||||
"contact.uuid": "%s",
|
||||
"details": {
|
||||
"registrationOffice": "Temp Registergericht Aurich",
|
||||
"registrationNumber": "111111"
|
||||
@ -138,12 +138,12 @@ class HsOfficePartnerControllerRestTest {
|
||||
{
|
||||
"partnerNumber": "20002",
|
||||
"partnerRel": {
|
||||
"anchorUuid": "%s",
|
||||
"holderUuid": "%s",
|
||||
"contactUuid": "%s"
|
||||
"anchor.uuid": "%s",
|
||||
"holder.uuid": "%s",
|
||||
"contact.uuid": "%s"
|
||||
},
|
||||
"personUuid": "%s",
|
||||
"contactUuid": "%s",
|
||||
"person.uuid": "%s",
|
||||
"contact.uuid": "%s",
|
||||
"details": {
|
||||
"registrationOffice": "Temp Registergericht Aurich",
|
||||
"registrationNumber": "111111"
|
||||
|
@ -235,9 +235,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
|
||||
{
|
||||
"type": "%s",
|
||||
"mark": "%s",
|
||||
"anchorUuid": "%s",
|
||||
"holderUuid": "%s",
|
||||
"contactUuid": "%s"
|
||||
"anchor.uuid": "%s",
|
||||
"holder.uuid": "%s",
|
||||
"contact.uuid": "%s"
|
||||
}
|
||||
""".formatted(
|
||||
HsOfficeRelationTypeResource.SUBSCRIBER,
|
||||
@ -281,9 +281,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
|
||||
.body("""
|
||||
{
|
||||
"type": "%s",
|
||||
"anchorUuid": "%s",
|
||||
"holderUuid": "%s",
|
||||
"contactUuid": "%s"
|
||||
"anchor.uuid": "%s",
|
||||
"holder.uuid": "%s",
|
||||
"contact.uuid": "%s"
|
||||
}
|
||||
""".formatted(
|
||||
HsOfficeRelationTypeResource.DEBITOR,
|
||||
@ -313,9 +313,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
|
||||
.body("""
|
||||
{
|
||||
"type": "%s",
|
||||
"anchorUuid": "%s",
|
||||
"holderUuid": "%s",
|
||||
"contactUuid": "%s"
|
||||
"anchor.uuid": "%s",
|
||||
"holder.uuid": "%s",
|
||||
"contact.uuid": "%s"
|
||||
}
|
||||
""".formatted(
|
||||
HsOfficeRelationTypeResource.DEBITOR,
|
||||
@ -346,9 +346,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
|
||||
.body("""
|
||||
{
|
||||
"type": "%s",
|
||||
"anchorUuid": "%s",
|
||||
"holderUuid": "%s",
|
||||
"contactUuid": "%s"
|
||||
"anchor.uuid": "%s",
|
||||
"holder.uuid": "%s",
|
||||
"contact.uuid": "%s"
|
||||
}
|
||||
""".formatted(
|
||||
HsOfficeRelationTypeResource.DEBITOR,
|
||||
@ -461,9 +461,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
"contactUuid": "%s"
|
||||
"contact.uuid": "%s"
|
||||
}
|
||||
""".formatted(givenContact.getUuid()))
|
||||
""".formatted(givenContact.getUuid()))
|
||||
.port(port)
|
||||