Michael Hoennig
1aed3236a5
Merge branch 'jhipster-generated'
...
# Conflicts:
# build.gradle
# cfg/spotless/eclipse_formatter.xml
# cfg/spotless/hsadminng.importorder
# src/main/java/org/hostsharing/hsadminng/HsadminNgApp.java
# src/main/java/org/hostsharing/hsadminng/domain/Asset.java
# src/main/java/org/hostsharing/hsadminng/domain/Membership.java
# src/main/java/org/hostsharing/hsadminng/domain/SepaMandate.java
# src/main/java/org/hostsharing/hsadminng/domain/Share.java
# src/main/java/org/hostsharing/hsadminng/repository/MembershipRepository.java
# src/main/java/org/hostsharing/hsadminng/security/SecurityUtils.java
# src/main/java/org/hostsharing/hsadminng/service/AssetService.java
# src/main/java/org/hostsharing/hsadminng/service/CustomerQueryService.java
# src/main/java/org/hostsharing/hsadminng/service/MembershipQueryService.java
# src/main/java/org/hostsharing/hsadminng/service/MembershipService.java
# src/main/java/org/hostsharing/hsadminng/service/SepaMandateQueryService.java
# src/main/java/org/hostsharing/hsadminng/service/ShareService.java
# src/main/java/org/hostsharing/hsadminng/service/dto/AssetDTO.java
# src/main/java/org/hostsharing/hsadminng/service/dto/CustomerCriteria.java
# src/main/java/org/hostsharing/hsadminng/service/dto/CustomerDTO.java
# src/main/java/org/hostsharing/hsadminng/service/dto/MembershipDTO.java
# src/main/java/org/hostsharing/hsadminng/service/dto/SepaMandateDTO.java
# src/main/java/org/hostsharing/hsadminng/service/dto/ShareDTO.java
# src/main/java/org/hostsharing/hsadminng/service/mapper/CustomerMapper.java
# src/main/java/org/hostsharing/hsadminng/web/rest/AssetResource.java
# src/main/java/org/hostsharing/hsadminng/web/rest/ShareResource.java
# src/main/java/org/hostsharing/hsadminng/web/rest/errors/ExceptionTranslator.java
# src/test/java/org/hostsharing/hsadminng/web/rest/AssetResourceIntTest.java
# src/test/java/org/hostsharing/hsadminng/web/rest/CustomerResourceIntTest.java
# src/test/java/org/hostsharing/hsadminng/web/rest/MembershipResourceIntTest.java
# src/test/java/org/hostsharing/hsadminng/web/rest/SepaMandateResourceIntTest.java
# src/test/java/org/hostsharing/hsadminng/web/rest/ShareResourceIntTest.java
2019-04-30 17:13:06 +02:00
Michael Hoennig
2c94d6a985
adding spotless, re-importing customer.jdl and spotlessApply
2019-04-30 17:08:45 +02:00
Michael Hoennig
1373756877
Revert "makes 'gw spotlessCheck' deliberately fail to test Jenkins pipeline"
...
This reverts commit dcf7bdc9
2019-04-30 13:13:57 +02:00
Michael Hoennig
dcf7bdc9b1
makes 'gw spotlessCheck' deliberately fail to test Jenkins pipeline
2019-04-30 13:07:27 +02:00
Michael Hoennig
b5d50acfbd
gw spotlessApply to latest revision, preparation for re-merging generated
2019-04-30 12:21:33 +02:00
Michael Hoennig
087e6617d3
using a proper displayLabel for the parent SepaMandate->Customer (HOWTO)
...
Unfortunately without a test for the HTML template changes of the Angular components
because these seem to come only with Protractor, which we had not configured in JHipster.
2019-04-29 18:43:23 +02:00
Michael Hoennig
0fd30a5700
adding AccessMappings SepaMandateDTO with tests + consequences (HOWTO)
2019-04-29 12:39:31 +02:00
Michael Hoennig
cc0857e33b
FluentBuilder<D> as interface with default method
2019-04-29 12:19:34 +02:00
Michael Hoennig
1916347490
Revert "adding AccessMappings SepaMandateDTO with tests + consequences (HOWTO)"
...
This reverts commit 328e809a
because I want all changes of this HOWTO in a single commit.
Unfortunately due to the access filter, the SepaMandateIntTest failed with branch coverage, as some branches were not reachable anymore.
2019-04-29 11:23:05 +02:00
Michael Hoennig
328e809a2b
adding AccessMappings SepaMandateDTO with tests + consequences (HOWTO)
2019-04-29 09:39:08 +02:00
Michael Hoennig
5835f15cd9
implemented more AssetDTO+ShareDTO tests and fixed but in ShareDTO
2019-04-28 14:15:51 +02:00
Michael Hoennig
187ccfdcc7
writtenFields->updatingFields and remove fields which are not actually updating (effectively same value)
2019-04-27 21:01:29 +02:00
Michael Hoennig
acfef3dfbe
test for equality via compareTo() to consider BigDecimal/DateTime etc. => effectively unchanged in update
2019-04-27 20:36:25 +02:00
Michael Hoennig
3abc201a8d
split up AssetDTOUnitTest and AssetDTOIntTest, AccessMappingsUnitTestBase
2019-04-27 17:56:50 +02:00
Michael Hierweck
2fdb914f6d
Merge branch 'master' of ssh://dev.hostsharing.net:29418/hsadmin/hsadmin-ng
2019-04-27 15:46:55 +02:00
Michael Hierweck
d4adbb972d
Sample data for customers.
2019-04-27 15:46:43 +02:00
Michael Hoennig
5edf97b230
AssetDTOUnitTest and Membership.displayLabel now with memberFrom/Until
2019-04-27 15:03:03 +02:00
Michael Hoennig
456a2f4811
reduced logging for determined user role to debug level
2019-04-27 13:48:27 +02:00
Michael Hoennig
956cadeb09
membership.model.ts: membershipDisplayLabel -> customerDisplayLabel
2019-04-27 13:23:32 +02:00
Michael Hoennig
efa2972375
code coverage improved for MembershipResource and CustomerResource
...
and Customer not explicitly deletable anymore
2019-04-27 12:05:30 +02:00
Michael Hoennig
3b0d46a4c8
better display labels and less columns in tables (deliberately not yet in SepaMandate*)
2019-04-27 11:30:15 +02:00
Michael Hoennig
b9a7c33c6a
explicitly mock user+role in *IntTest, set global role HOSTMASTER only in dev profile
2019-04-27 11:10:36 +02:00
Michael Hoennig
5d843f4725
org.hostsharing.hsadminng logging on INFO level and logging in SecurityUtils
2019-04-27 10:28:16 +02:00
Michael Hoennig
53382beb88
MembershipDTO JSonSerializerWithAccessFilter proper membershipDisplayReference
2019-04-27 09:52:54 +02:00
Michael Hoennig
c8bb8cb2ca
@AccessFrom in AssetDTO and AssetMapper with improved membershipDisplayReference
2019-04-27 07:13:52 +02:00
Michael Hoennig
6570981dc2
Revert "@AccessFrom in AssetDTO and AssetMapper with improved membershipDisplayReference"
...
This reverts commit 4ad0d5d954
.
2019-04-27 06:37:56 +02:00
Michael Hoennig
51ff0c4990
Revert "MembershipDTO JSonSerializerWithAccessFilter proper membershipDisplayReference"
...
This reverts commit da5b667607
.
2019-04-27 06:37:30 +02:00
Michael Hoennig
7e3d3ec5de
Revert "better display labels and less columns in tables (deliberately not yet in SepaMandate*)"
...
This reverts commit d81b71cd3a
.
2019-04-27 06:36:11 +02:00
Michael Hoennig
d81b71cd3a
better display labels and less columns in tables (deliberately not yet in SepaMandate*)
2019-04-26 22:11:49 +02:00
Michael Hoennig
da5b667607
MembershipDTO JSonSerializerWithAccessFilter proper membershipDisplayReference
2019-04-26 17:43:22 +02:00
Michael Hoennig
4ad0d5d954
@AccessFrom in AssetDTO and AssetMapper with improved membershipDisplayReference
2019-04-26 17:15:39 +02:00
Michael Hierweck
7b039fcedb
Remove outdate liquibase changesets
2019-04-26 12:54:10 +02:00
Michael Hoennig
a10a3a62e5
fix failing unit test and better coverage
2019-04-26 11:27:29 +02:00
Michael Hoennig
ea08f4a6c6
removed bloat-code from JsonComponents in DTOs
2019-04-26 10:26:25 +02:00
Michael Hoennig
a6fd210de5
test code coverage improved and more JSon/field types
2019-04-25 18:53:32 +02:00
Michael Hoennig
fb3b79cfc4
for now, make give all users the role of a HOSTMASTER
2019-04-25 12:56:51 +02:00
Michael Hoennig
3e30cf2d17
merging current DTO during deserialization
2019-04-25 12:22:45 +02:00
Michael Hoennig
fb961ca4a1
merging from master
2019-04-24 17:41:28 +02:00
Michael Hierweck
7c7d79c870
Fixed tests after merge.
2019-04-24 17:22:56 +02:00
Michael Hierweck
5ac1277e7e
Merge branch 'jhipster-generated'
2019-04-24 16:14:14 +02:00
Michael Hierweck
2a4ee0507c
Preliminary completed customer model.
2019-04-24 14:36:11 +02:00
Michael Hoennig
ad1517a16e
JSonAccessFilter with generic access to grand parent role
2019-04-24 13:23:08 +02:00
Michael Hoennig
639ea06243
JSonAccessFilter with initially working (hardcoded) grand parent role
2019-04-24 12:30:26 +02:00
Michael Hoennig
a94516b3ce
JSonSerializer/DeserializerWithAccessFilter: also use role in parent
2019-04-23 14:37:49 +02:00
Michael Hoennig
1505e7bd66
JSonDeserializerWithAccessFilter: shouldDetectMultipleSelfIdFields
2019-04-23 09:22:23 +02:00
Michael Hoennig
63bd602397
JSonDeserializerWithAccessFilter with working access rights validation
2019-04-23 08:31:26 +02:00
Michael Hoennig
bb0fb4aa78
parallel structure for JSonSerializer/DeserializerWithAccessFilter
2019-04-23 06:57:06 +02:00
Michael Hoennig
90316a262b
JSonSerializerWithAccessFilter - idea for parallel structure with deserializer
2019-04-23 06:28:36 +02:00
Michael Hoennig
741e91bb78
JSonSerializerWithAccessFilter - idea for generalization of field types
2019-04-23 06:27:41 +02:00
Michael Hoennig
1dae396d99
JSonDeserializerWithAccessFilter
2019-04-23 06:17:55 +02:00