memberNumber as partnerNumber+memberNumberSuffix #13

hsh-michaelhoennig · 2024-01-24T12:47:11+01:00

hsh-michaelhoennig commented

2024-01-24 12:47:11 +01:00

No description provided.

hsh-michaelhoennig added 71 commits 2024-01-24 12:47:12 +01:00

csv-test-import-files e2a69fe103

import legacy hsadmin db (WIP) 545569942b

importing business-partners + contacts from CSV b528cf7c97

persist contacts, persons and partners 5bf2dd76fe

persist memberships+debitors - still with wrong reference fa5fb30117

import bank-accounts + sepa-mandates d44d2e3e82

add some asserts 1134401310

add some asserts to sepa mandate import e1dd9b08c2

use test database a4c1614939

amend architecture test 33fabf35e3

rename ImportBusinessPartners to ImportOfficeTables 37e867c33d

header handling for buisoness partners import file e8e898d18d

fix typo member_asstr_id->member_asset_id a5d1544bac

Merge remote-tracking branch 'origin/master' into db-migration 9391877a46

fix partner import, the last row was skipped ae1b6b44b6

improve test assertions a042eff8bc

use record[named-field] for column access 1b3eef0e14

import legacy-ids for contact, partner + sepamandate 97f428055e

fix spelling of semamandate abbb61727b

Merge remote-tracking branch 'origin/master' into db-migration 5280527eae

implement import of coop-share-transactions b0bfb127b6

import coop assets 53d46da49a

persist shares+assets 7e31e95d57

HSDB Dump Script 1f278819c3

Script that is a able to dump HSDB (legacy) data to csv files.
Dump of "office" module data already implemented.

add: membership-fee-billable, debitor.billable, debitor.billingContact, debitor.defaultPrefix 980524e7ab

Merge remote-tracking branch 'origin/master' into db-migration 368170d27e

Merge pull request 'HSDB Dump Script' (#9 ) from hsh-michaelhierweck-hsdb-dump-script into db-migration ab281c93a7

Reviewed-on: #9
Reviewed-by: Michael Hoennig <michael.hoennig@hostsharing.net>

add column vatReverseCharge to table hs_office_debitor + view hs_office_debitor_rv 340a53a3d5

import debitorPrefix, debitorSuffix, defaultPrefix etc. (WIP) 5d7a245d9d

remove hsh00- from default prefix 90508df42d

add defaultPrefix to HsOfficeDebitorEntity.toString() 5162aa0606

amend test data (Paule -> Petra) which was confusingly similar to basic test data (Paul) + cleanup 76ad26b747

increase length of hs_office_contact.label to 96 1299b4e20a

delete test data before import e9a8699aa1

always use jdbc:postgresql://localhost:5432/postgres for ImportTestData 70621fd482

Liquibase-Scripts and database migration possible with explicit (non-superuser) DB-User db7c101691

use env variables for admin+restricted user, jdbc-url and admin-password 2f5acd4171

separately import contact as billing or contractual contact 033a86f10d

environment scripting for import-office-tables ff2671ff92

remove precondition 2f3e4038e4

revert accidental comment about billingContact cd7ea891c2

import operational contact + allow multiple assignments of contacts 3a66a28a33

HasUUid for all Entity classes and migrate SOLE_AGENT+JOINT_AGENT to REPRESENTATIVE 19f962cf2e

enable import of a single contact for multiple roles 683c2f0ce4

remove _CONTACT from relationship types 2e609884bf

make contacts.csv easier readable by empty lines, comments and better numbering 1e5bc03407

first version of functional data model of office module 1512e0e1a5

PartnerDetails: add birthplace, and improve toString and introduce @Tag("import") 31141ad4c3

UML object diagram for new target data model for business partners d03fb70465

add ex-partner to Relationship-Type and properly extract distinct persons from contacts.csv 007e1522b7

fix import-office-data alias / gw importOfficeData a0abec6a85

auto generate representative relationship if no explicit contractor set, add vip-contact and fix db enum value for ex-partner 5d298a498f

name alias gw-importOfficeData and fix test task dependency a382c141b3

add missing membershipfeebillable to DB, OpenAPI and Patcher 6d4ba9b094

add missing birthPlace to OpenAPI and Patcher d4785b472c

add missing debitorNumberPrefix to OpenAPI - not patchable, though 06a39c421e

add missing billable and vatReverseCharge to OpenAPI and Patcher d069e87c01

in target diagram: introduce partner-person partner-role to Hostsharing eG 837e7fee97

add refundBankAccount to DebitorEntityPatcher 52d4b4d458

improved aliases fe4b0866ed

reactivate uncommented test and remove commented code b00c4ce8a8

remove commented code and other cleanup from code-review 2a1e933c00

ignore .environment* 678c79cf4f

separate actual import and verification test methods 13ddaa2afd

rename debitorNumberPrefix -> partnerNumber 9f9575f51f

rename membernumber -> membernumbersuffix 3c89164a67

fixes in data-model for data-import acf48004b4

split memberNumber into partnerNumber+memberNumberSuffix (WIP) e444f648b3

Merge remote-tracking branch 'origin/master' into memberNumberSuffix-and-partnerNumber e0d410fd3b

# Conflicts:
#	src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java
#	src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java
#	src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntity.java
#	src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepository.java
#	src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntity.java
#	src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntity.java
#	src/main/resources/api-definition/hs-office/hs-office-partner-schemas.yaml
#	src/main/resources/db/changelog/220-hs-office-partner.sql
#	src/main/resources/db/changelog/223-hs-office-partner-rbac.sql
#	src/main/resources/db/changelog/228-hs-office-partner-test-data.sql
#	src/main/resources/db/changelog/270-hs-office-debitor.sql
#	src/main/resources/db/changelog/273-hs-office-debitor-rbac.sql
#	src/main/resources/db/changelog/303-hs-office-membership-rbac.sql
#	src/main/resources/db/changelog/308-hs-office-membership-test-data.sql
#	src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntityUnitTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityPatcherUnitTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityUnitTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepositoryIntegrationTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerAcceptanceTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerRestTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityUnitTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepositoryIntegrationTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/partner/TestHsOfficePartner.java
#	src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerAcceptanceTest.java
#	src/test/resources/migration/dump.sh

combined memberNumber bcf8ad2148

combined memberNumber (partnerNumber+memberNumberSuffix) 51f406c84e

hsh-michaelhoennig added 1 commit 2024-01-24 12:50:51 +01:00

rebasing aftermaths cf4caf6e66

hsh-michaelhoennig added 2 commits 2024-01-24 13:23:27 +01:00

improved documentation e304cf9bf4

TODO cleanup c70705a2e6

hsh-michaelhoennig added 1 commit 2024-01-24 13:25:00 +01:00

improve documentation 06657f26bb

hsh-michaelhoennig reviewed 2024-01-24 14:11:10 +01:00

src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java Outdated

						
				@ -53,2 +60,4 @@

				    private int shareCount;

				    /**

				     * The ooking reference.

hsh-michaelhoennig commented

2024-01-24 14:11:10 +01:00

B

hsh-michaelhoennig marked this conversation as resolved

hsh-michaelhoennig reviewed 2024-01-24 14:21:01 +01:00

src/main/resources/db/changelog/223-hs-office-partner-rbac.sql Outdated

						
				@ -181,3 +180,3 @@

				    '(select idName from hs_office_person_iv p where p.uuid = target.personUuid)',

				    $updates$

				        debitorNumberPrefix = new.debitorNumberPrefix,

				        partnerNumber = new.partnerNumber,

hsh-michaelhoennig commented

2024-01-24 14:21:01 +01:00

entfernen, nicht sinnvoll

hsh-michaelhoennig marked this conversation as resolved

hsh-michaelhoennig reviewed 2024-01-24 14:22:20 +01:00

src/main/resources/db/changelog/300-hs-office-membership.sql

						
				@ -14,3 +14,3 @@

				    partnerUuid             uuid not null references hs_office_partner(uuid),

				    mainDebitorUuid         uuid not null references hs_office_debitor(uuid),

				    memberNumber            numeric(5) not null unique,

				    memberNumberSuffix      char(2) not null check (

hsh-michaelhoennig commented

2024-01-24 14:22:20 +01:00

add unique constraint mit partnerNumber

hsh-michaelhoennig marked this conversation as resolved

hsh-michaelhoennig reviewed 2024-01-24 14:25:47 +01:00

src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java Outdated

						
				@ -73,3 +73,3 @@

				        @Test

				        void globalAdmin_canFindCoopAssetsTransactionsByMemberNumber() {

				        void globalAdmin_canFindCoopAssetsTransactionsByMemberNumberSuffix() {

hsh-michaelhoennig commented

2024-01-24 14:25:47 +01:00

ohne "Suffix" im Namen

hsh-michaelhoennig marked this conversation as resolved

hsh-michaelhoennig reviewed 2024-01-24 14:26:50 +01:00

src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java Outdated

						
				@ -116,3 +115,3 @@

				        @Test

				        void globalAdmin_canFindCoopAssetsTransactionsByMemberNumberAndDateRange() {

				        void globalAdmin_canFindCoopAssetsTransactionsByMemberNumberSuffixAndDateRange() {

hsh-michaelhoennig commented

2024-01-24 14:26:50 +01:00

ohne "Suffix" im Namen

hsh-michaelhoennig marked this conversation as resolved

hsh-michaelhoennig reviewed 2024-01-24 14:28:36 +01:00

src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerAcceptanceTest.java Outdated

						
				@ -73,3 +73,3 @@

				        @Test

				        void globalAdmin_canFindCoopSharesTransactionsByMemberNumber() {

				        void globalAdmin_canFindCoopSharesTransactionsByMemberNumberSuffix() {

hsh-michaelhoennig commented

2024-01-24 14:28:36 +01:00

ohne "Suffix" im Namen

hsh-michaelhoennig marked this conversation as resolved

hsh-michaelhoennig reviewed 2024-01-24 14:32:53 +01:00

src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityPatcherUnitTest.java Outdated

						
				@ -104,6 +104,12 @@ class HsOfficeDebitorEntityPatcherUnitTest extends PatchUnitTestBase<

				                        HsOfficeDebitorEntity::setBillingContact,

				                        newBillingContact(PATCHED_CONTACT_UUID))

				                        .notNullable(),

				                new SimpleProperty<>(

hsh-michaelhoennig commented

2024-01-24 14:32:53 +01:00

Dublette entfernen

hsh-michaelhoennig marked this conversation as resolved

hsh-michaelhierweck requested review from hsh-michaelhierweck 2024-01-24 14:54:03 +01:00

hsh-michaelhierweck refused to review 2024-01-24 14:54:38 +01:00

hsh-michaelhierweck approved these changes 2024-01-24 14:55:03 +01:00

hsh-michaelhoennig added 3 commits 2024-01-24 15:56:41 +01:00

Merge remote-tracking branch 'origin/master' into memberNumberSuffix-and-partnerNumber c16143acbd

# Conflicts:
#	src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityUnitTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepositoryIntegrationTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityUnitTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipRepositoryIntegrationTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateControllerAcceptanceTest.java

amendmends according to code review and rebasing aftermaths 4ca89df6fd

improve test coverage d34e1f9e14

hsh-michaelhoennig merged commit fb974a3b43 into master

2024-01-24 15:57:16 +01:00

hsh-michaelhoennig referenced this issue from a commit

2024-01-24 15:57:18 +01:00

memberNumber as partnerNumber+memberNumberSuffix (#13)

Sign in to join this conversation.

No reviewers