Commit Graph
100 Commits
Author SHA1 Message Date
Christoph 0cb56e2391 refactor controllers 2020-04-09 18:18:28 +02:00
Christoph 65ad352e03 update properties 2020-04-09 18:17:58 +02:00
Christoph bf715fe20a add logging aspect + annotations 2020-04-09 18:17:44 +02:00
Christoph 3085f58d36 add spring aop deps 2020-04-09 18:17:19 +02:00
Christoph bb84217973 swagger config ausgelagert 2020-04-09 18:17:01 +02:00
Christoph 0fa1fcbf88 add controlleradvice modelattribute setting 2020-04-09 18:16:34 +02:00
ChristophandGitHub 075eb99970 Merge pull request #3 from ChUrl/REFACTOR-services
Refactor services
2020-04-08 21:24:45 +02:00
ChristophandGitHub 97729fc151 Update gradle.yml 2020-04-08 21:12:41 +02:00
Christoph 4ac3164569 fix some warnings 2020-04-08 21:08:57 +02:00
Christoph 70f3ffdc84 test fix + spotbugs dead assignment 2020-04-08 20:52:22 +02:00
Christoph 482dde7960 "finish" service refactor + fix obvious bugs after refactor (everything should run pretty much) 2020-04-08 20:48:42 +02:00
Christoph 9da2d51897 finish group service 2020-04-07 23:00:23 +02:00
Christoph 8d88ef4346 finish up group service? 2020-04-07 21:53:04 +02:00
Christoph fbe25deda1 renamings + rework group creation process + remove most wrapper types 2020-04-07 20:27:35 +02:00
Christoph 897722fbd7 ControllerService + CreationController + GroupService improvements + disabled controllerservice tests, the need to be rewritten 2020-04-07 17:58:04 +02:00
Christoph e13af57ab6 replace keykloakservice with constructor 2020-04-07 01:42:30 +02:00
Christoph 9c6732d2d2 loggers replaced with lombok, additional logging, further general service refactoring 2020-04-07 01:32:40 +02:00
Christoph 952b32a86c add idservice + finish up (hope) projectionservice + eventstoreservice 2020-04-07 00:13:26 +02:00
Christoph 6d7b9a72b1 update mysql to use window functions 2020-04-06 20:10:30 +02:00
Christoph 7f05e0fb10 greater projectionservice refactoring 2020-04-06 17:21:09 +02:00
Christoph 5da796d66d slight repository refactor 2020-04-06 14:55:34 +02:00
Christoph 9e158ad6d0 badpayloadexception + more reordering ugh 2020-04-06 01:06:22 +02:00
Christoph 3d66f58af8 new eventbuilderservice + projectionservice + searchservice, some renamings etc 2020-04-06 00:07:46 +02:00
ChristophandGitHub 5a5d1586ed Merge pull request #1 from hhu-propra2/master
update
2020-04-05 22:10:50 +02:00
Christoph 4b06d3b2e1 spotbugs
Co-authored-by: Christoph <tobi@urpost.de>
2020-04-05 21:58:06 +02:00
ChristophandGitHub ee00569415 Merge pull request #166 from hhu-propra2/DOC-update-readme
Doc update readme
2020-04-05 21:48:11 +02:00
Christoph 74e345c522 status expected?
Co-authored-by: Christoph <tobi@urpost.de>
2020-04-05 21:47:12 +02:00
Christoph ee050c2485 Merge remote-tracking branch 'origin/DOC-update-readme' into DOC-update-readme 2020-04-05 21:45:37 +02:00
Christoph 6daf351852 Merge branch 'dev' into DOC-update-readme 2020-04-05 21:45:10 +02:00
ChristophandGitHub c6918a1276 Merge branch 'dev' into DOC-update-readme 2020-04-05 21:43:11 +02:00
Christoph ab9c621739 update readme
Co-authored-by: Christoph <tobi@urpost.de>
2020-04-05 21:42:04 +02:00
ChristophandGitHub 4a3aa5bc41 Merge pull request #163 from hhu-propra2/FEATURE-memberlist-names
show user givennames in private groups
2020-04-05 21:40:19 +02:00
Christoph 63fa257ec9 some grammar corrections
Co-authored-by: Christoph <tobi@urpost.de>
2020-04-05 21:37:48 +02:00
ChristophandGitHub c592d39c41 Merge pull request #162 from hhu-propra2/TEST-api-tests
new api tests + fixes
2020-03-30 11:17:46 +02:00
Christoph b730dee4b1 fix uuidMock() after merge
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-30 11:15:40 +02:00
ChristophandGitHub 935b1c7a60 Merge branch 'dev' into TEST-api-tests 2020-03-30 11:08:47 +02:00
ChristophandGitHub 5bc695b01b Merge pull request #161 from hhu-propra2/TEST-event-tests
Test event tests
2020-03-30 11:06:36 +02:00
ChristophandGitHub 9b68403934 Merge branch 'dev' into TEST-event-tests 2020-03-30 10:47:07 +02:00
ChristophandGitHub 67ed42b31f Merge pull request #159 from hhu-propra2/REFACTOR-checkstyle-java-warnings
Refactor checkstyle java warnings
2020-03-30 10:20:47 +02:00
ChristophandGitHub 02faf526c3 Merge pull request #160 from hhu-propra2/master
merge ci to refactor
2020-03-30 09:52:49 +02:00
Christoph 3d0da633b5 change controller of csv method
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 17:49:33 +02:00
Christoph 0c8e841c8e new api tests + fixes
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 17:24:25 +02:00
Christoph 58f0cfbe33 new individual event-tests + removed old comments + removed doubled exception
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 15:47:25 +02:00
Christoph 33ccf8ddcb init individual event-tests
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 14:13:26 +02:00
Christoph 36ebb6b8b6 rename package
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 14:12:43 +02:00
Christoph eee7b4367a two mapping renames
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 13:18:54 +02:00
Christoph 100f5649c0 invite mappings to search controller + slight invite changes
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 00:45:32 +01:00
Christoph 4cd0808fdc split main controller into multiple
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 00:32:32 +01:00
Christoph 40e86d6d55 use static method
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 00:17:40 +01:00
Christoph 98607dcf49 remove simple to fix warnings
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 00:15:22 +01:00
ChristophandGitHub c5d48a561b include new dev-branch in actions 2020-03-28 19:41:02 +01:00
ChristophandGitHub a293cb1935 Merge pull request #153 from hhu-propra2/docker-fix
docking
2020-03-27 15:16:52 +01:00
Christoph 3350edb887 docking
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-27 15:15:43 +01:00
ChristophandGitHub 2b7730a3c6 Merge pull request #152 from hhu-propra2/fix-no-access
fix
2020-03-27 15:08:59 +01:00
Christoph 8a24aee6de fix
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-27 15:04:52 +01:00
ChristophandGitHub 13187ccf55 Merge pull request #151 from hhu-propra2/fixxxxx
fix
2020-03-27 14:55:49 +01:00
Christoph 3f192c9b81 fix
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-27 14:53:31 +01:00
ChristophandGitHub e387206205 Merge pull request #149 from hhu-propra2/invite-link-update
Invite link update
2020-03-27 14:40:39 +01:00
Christoph 63d9b76d40 caching
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-27 14:33:01 +01:00
Christoph 9ccb7c77a2 fix invite
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-27 14:04:32 +01:00
Christoph ef00c42f6f fix invite
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-27 13:45:11 +01:00
Christoph 858efd57d3 fixfixfix
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-27 13:17:09 +01:00
Christoph 8c29d04740 fix schema
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-27 13:15:05 +01:00
Christoph 56a81ce66f caching
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-27 12:57:47 +01:00
Christoph cc64943663 only show link to admin
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 21:35:52 +01:00
Christoph 02e7bcbcc4 fix api
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 21:19:59 +01:00
Christoph b37f2349aa secure invite link
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 20:53:59 +01:00
Christoph 5e5939aa42 Merge branch 'csrf' into invite-link-update
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/resources/schema.sql
2020-03-26 18:28:34 +01:00
Christoph 853a5bcb03 fix forms to automatically generate csrf tokens
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 18:21:52 +01:00
Christoph 832a03c82f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	documentation/day02_progress.adoc
#	documentation/day03_progress.adoc
#	documentation/day04_progress.adoc
#	documentation/day05_progress.adoc
#	documentation/day06_progress.adoc
#	documentation/day07_progress.adoc
#	documentation/day08_progress.adoc
#	documentation/day09_progress.adoc
#	documentation/day10_progress.adoc
#	documentation/day11_progress.adoc
#	documentation/day12_progress.adoc
#	documentation/day13_progress.adoc
#	documentation/day14_progress.adoc
#	documentation/day15_progress.adoc
#	documentation/day16_progress.adoc
#	documentation/day17_progress.adoc
#	mysql/db/entrypoint/schema.sql
2020-03-26 17:22:46 +01:00
Christoph b50783cd8c merge fix
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 17:21:28 +01:00
Christoph 82e9611d47 merge fix
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 17:20:58 +01:00
Christoph 68a9ddeecc create links
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 17:10:15 +01:00
Christophand[Mahgs] <maxoerter@gmx.de> 9302bc68b5 queries + inviteservice
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 17:04:12 +01:00
Christophand[Mahgs] <maxoerter@gmx.de> f581169afc queries
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 16:45:54 +01:00
Christophand[Mahgs] <maxoerter@gmx.de> d336c10802 schema fix + repo + dto
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 16:41:18 +01:00
ChristophandGitHub 598ec3ea6e Merge pull request #147 from hhu-propra2/serchAll
Serch all
2020-03-26 16:40:16 +01:00
Christoph 666bab0c03 entrypoint
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 16:35:31 +01:00
Christoph 63c924dbb9 add mysql schema entrypoint
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 16:30:29 +01:00
Christoph 083044bbbb update dockerfile: pull wait-for-it from github
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 16:28:28 +01:00
Christoph 33e3d9d3f5 docker profiles, docker compose, mysql entrypoint, security
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 16:06:40 +01:00
ChristophandGitHub eaf8631c9f Merge pull request #139 from hhu-propra2/checkstyle
fixed checkstyle problems
2020-03-25 16:53:34 +01:00
Christophand[Mahgs] <maxoerter@gmx.de> 02d81d4ee8 prevent private lectures in frontend, still needs validation
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-25 16:44:53 +01:00
ChristophandGitHub 9045cace9c Merge pull request #138 from hhu-propra2/add-ValidationService
Add validation service
2020-03-25 16:12:05 +01:00
ChristophandGitHub 7be3db7e0d Merge pull request #137 from hhu-propra2/group-list-ordering
Group list ordering
2020-03-25 16:10:11 +01:00
Christoph f09b498369 Merge remote-tracking branch 'origin/master' into group-list-ordering
# Conflicts:
#	src/main/java/mops/gruppen2/service/GroupService.java
2020-03-25 16:09:46 +01:00
ChristophandGitHub 0ec805f3ae Merge pull request #136 from hhu-propra2/killertester
Killertester
2020-03-25 16:07:12 +01:00
Christoph[Mahgs] <maxoerter@gmx.de>XXNitram
f0e49dfc55 slight changes
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
2020-03-25 15:57:07 +01:00
Christophand[Mahgs] <maxoerter@gmx.de> ed4a9b5728 add badges in group lists
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-25 15:46:58 +01:00
ChristophandGitHub 74038428df Merge pull request #134 from hhu-propra2/fix-group-search-number-of-users
Fix group search number of users
2020-03-25 14:48:26 +01:00
Christoph[Mahgs] <maxoerter@gmx.de>XXNitram
22ae8a81dc partial fix search: max user anzahl display
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
2020-03-25 14:46:02 +01:00
ChristophandXXNitram 473d58ae3b partial fix search: group is displayed again after leaving
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
2020-03-25 13:56:43 +01:00
ChristophandGitHub cf685fb6ff Merge pull request #128 from hhu-propra2/refactor-controller
Refactor controller
2020-03-25 13:08:01 +01:00
Christoph 551534d4ff Merge branch 'master' into refactor-controller
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
2020-03-25 13:03:22 +01:00
ChristophandGitHub a4d603c580 Merge pull request #132 from hhu-propra2/swagger-doku
add swagger api doku
2020-03-25 10:44:41 +01:00
ChristophandGitHub 9bbede1201 add swagger api doku 2020-03-25 10:30:11 +01:00
ChristophandGitHub 386df44bde Update README.adoc 2020-03-25 10:28:01 +01:00
Christoph a0d6243b5c improved testing 2020-03-24 22:28:56 +01:00
Christoph cdb22828aa remove checkGroup 2020-03-24 17:00:41 +01:00
Christoph 8eda960e39 remove checkGroup 2020-03-24 16:30:05 +01:00