Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #3

Open
wants to merge 203 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
203 commits
Select commit Hold shift + click to select a range
7dd8b75
Add: Using javascript HttpRequest to create patient
m-benamor Apr 21, 2020
01c8764
Add: handle conflict response in GUI and allow the creation of tentat…
m-benamor Apr 27, 2020
012c1ff
Add: add new "addPatient" rest resource for add patient page (with JS…
m-benamor Apr 29, 2020
c7b383c
Merged in Fix/CreateTentativePatient (pull request #118)
m-benamor Apr 30, 2020
f998c7e
Merged in feature/CreatePatientwithJSRequest (pull request #117)
m-benamor Apr 30, 2020
ba17029
Fix: restore create patient page
m-benamor May 13, 2020
a8cd7a9
Merged in Fix/RestoreCreatePatientPage (pull request #124)
m-benamor May 13, 2020
8e4414a
Extended pattern for fieldmatching with an excaped dot
torbrenner May 26, 2020
ef81964
Fixed fieldName extraction for fields with dots
torbrenner May 26, 2020
fa4df4c
Added newman tests for fields with dots
torbrenner May 26, 2020
2ea8cf5
Changed the regex for detecting the fields to create only one group
torbrenner May 26, 2020
22456e9
Changed tests to don't use environment idat
torbrenner Jun 4, 2020
1f145c3
Merged in feature/DotSeperatedIdatFields (pull request #125)
torbrenner Jun 4, 2020
3ad290a
Fix: add patient with address newman test
m-benamor Jun 5, 2020
ae083d3
Add: newman test of edit patient with address
m-benamor Jun 5, 2020
d9c4834
Fix: newman test default config
m-benamor Jun 5, 2020
939e9a5
Merged in bugfix/AddPatientWithAddressTests (pull request #127)
m-benamor Jun 8, 2020
5e1a9ba
Merged in fix/NewmanTestDefaultConfig (pull request #128)
m-benamor Jun 8, 2020
f447310
Fix: validate tokens newman test
m-benamor Jun 9, 2020
13988df
Add: add insurance number to ui
m-benamor Jun 5, 2020
78f7783
Merged in fix/newmanTestValidateToken (pull request #129)
m-benamor Jun 9, 2020
3b03620
Merged in feature/AddIdatFieldsToUI (pull request #131)
m-benamor Jun 12, 2020
533fcb5
Merge branch '1.9-RC' into development
m-benamor Jul 3, 2020
a6250cf
Merge branch '1.9-RC' into development
m-benamor Jul 3, 2020
094a804
Fix: the pipeline marked as success even if one test failed
m-benamor Jul 3, 2020
18be764
Merged in fix/returnNewmanExitCodePipeline (pull request #137)
m-benamor Jul 3, 2020
14887a8
Fix: exit failed pipeline after the creation of test report
m-benamor Jul 3, 2020
c06d431
Merge branch 'fix/returnNewmanExitCodePipeline' into development
m-benamor Jul 3, 2020
7ba8ef8
Merge branch '1.9-RC' into development
m-benamor Jul 6, 2020
56bfd37
Merge branch '1.9-RC' into development
torbrenner Jul 9, 2020
94b4fa6
Changed version number to next SNAPSHOT version
torbrenner Jul 9, 2020
be005da
Fixed missing imports in Config class
torbrenner Jul 9, 2020
d9ec817
Add: support JCE Cryptography API using RSA
m-benamor Jul 13, 2020
fd74c5c
Add: read cryptographic keys and initialise encryptors with the speci…
m-benamor Jul 13, 2020
f8dc9d4
Add: generated ID can be configured to be always encrypted before exp…
m-benamor Jul 13, 2020
f67ffa3
Merged in feature/getEncryptedID (pull request #140)
m-benamor Jul 16, 2020
b5cccc1
Merge branch '1.9-RC' into development
m-benamor Jul 21, 2020
20973cd
Add: configuration to generate specific ID eagerly
m-benamor Jul 27, 2020
1822309
Add: generate specific ID eagerly
m-benamor Jul 27, 2020
142c260
Merged in feature/EagerSingleIdGeneration (pull request #145)
m-benamor Aug 6, 2020
090e81b
Merge branch '1.9-RC' into development
m-benamor Aug 21, 2020
8f5ca91
Added buildnumber-maven-plugin to pom.xml
torbrenner Sep 9, 2020
97b95d8
Version now follows Syntax: 1.10-SNAPSHOT-[commitHash]-[date{yyyyMMdd…
torbrenner Sep 9, 2020
647c6ce
Merged in feature/buildsContainCommitHash (pull request #148)
torbrenner Sep 14, 2020
4819bd0
Reading configuration file from path defined in environment variables
galinatremper Sep 14, 2020
db9939b
fix: readConfigFromEnv now returns null if no configuration file was …
torbrenner Sep 15, 2020
3fd115e
Merge branch '1.9-RC' into development
m-benamor Sep 18, 2020
3e17647
refactor: Changed env CONFIG_DIRS to MAINZELLISTE_CONFIG_DIRS
torbrenner Sep 21, 2020
8a7c03b
refactor: changed while loop to for loop
torbrenner Sep 21, 2020
6904c46
docs: Updated changelog
torbrenner Sep 21, 2020
686550a
Merge remote-tracking branch 'origin/development' into feature/readCo…
torbrenner Sep 21, 2020
b774cd5
Merged in feature/readConfigFile (pull request #149)
galinatremper Sep 21, 2020
00adac1
refactor: add new method returning the cipher text as byte array
m-benamor Sep 22, 2020
8bc5cfc
refactor: add a key wrapper class to facilitate the use of crypto key…
m-benamor Sep 22, 2020
d4bf51a
add: support hybrid encryption with Tink
m-benamor Sep 22, 2020
ae570a1
Merged in feature/encryptionWithTink (pull request #151)
m-benamor Sep 23, 2020
e78c833
Merge branch '1.9-RC' into development
m-benamor Sep 25, 2020
dc6da3d
test: test adding new ID to an existing patient retrieved by its exte…
m-benamor Sep 30, 2020
60ab1ab
fix: change to a patient not persisted, if the existing patient retri…
m-benamor Sep 30, 2020
ebd19a6
Merged in bugfix/persistIDdetachedEntity (pull request #152)
m-benamor Sep 30, 2020
c4e7e33
Merge branch '1.9-RC' into development
m-benamor Oct 1, 2020
b5bdd68
refactor: move the instantiation of crytoKey and encryption to the co…
m-benamor Oct 1, 2020
f117552
Merged in refactor/encryption (pull request #155)
m-benamor Oct 2, 2020
df73473
Merge branch '1.9-RC' into development
m-benamor Oct 2, 2020
7aa292b
Merge branch '1.9-RC' into development
m-benamor Oct 13, 2020
20dff62
fix: migrate to log4j2
m-benamor Oct 13, 2020
f5680d2
Merge branch '1.9-RC' into development
m-benamor Oct 29, 2020
a58e6ad
Added first implementation for cryptoIds (with dummy encryption method)
galinatremper Nov 8, 2020
f4906c9
Added Tink deterministic symmetric encryption to encryption methods
galinatremper Nov 10, 2020
0ab4a91
Fixed persistent feature for Elastic und SimpleIDGenerator
galinatremper Nov 11, 2020
f5da32d
Added integration tests for cryptoIds, adjusted read and editToken va…
galinatremper Nov 12, 2020
d833a75
Fixed: Redirect bug in case of transient ids
galinatremper Nov 13, 2020
338dfd1
Updated changelog
galinatremper Nov 13, 2020
2660d30
Merged in feature/cryptoIds (pull request #158)
galinatremper Nov 13, 2020
38f1ed9
Merge branch '1.9-RC' into development
m-benamor Nov 17, 2020
a3b885d
fix: wrong reference to org.apache.commons.lang package
m-benamor Nov 17, 2020
d5898aa
Merge branch '1.9-RC' into development
m-benamor Nov 18, 2020
1ba6a5d
Excluded the main id from the list of ids which are co-generated eagerly
galinatremper Nov 23, 2020
a97fc78
Added integration test for bugfix
galinatremper Nov 24, 2020
d6dd428
Status code is always 400 if the cryptoId has invalid format
galinatremper Nov 24, 2020
059c74d
Merged in bugfix/falseInputValidation (pull request #165)
galinatremper Dec 2, 2020
400ddd8
Merged in bugfix/doublePatientIds (pull request #163)
galinatremper Dec 2, 2020
334de0c
Added validation of checkMatch-Token, return only requested Ids in be…
galinatremper Dec 4, 2020
dadd5b4
Merged in bugfix/bestMatchReturnIds (pull request #168)
galinatremper Dec 9, 2020
862ea60
Merge branch '1.9-RC' into development
m-benamor Dec 9, 2020
4f3c2c0
Added decryption to asymmetric encryption methods,
galinatremper Dec 13, 2020
018f919
Deleted unused import
galinatremper Dec 15, 2020
b1b85a4
Merged in feature/asymmetricDecryption (pull request #170)
galinatremper Dec 15, 2020
0b00afc
Fixed bugs in integration tests
galinatremper Dec 16, 2020
2688828
Merged in bugfix/decryptionTests (pull request #171)
galinatremper Dec 17, 2020
509f652
refactor: move get add patient token from PatientBackend to PatientsR…
m-benamor Dec 21, 2020
8fc25af
Merge branch 'master' into development
m-benamor Jan 14, 2021
4c606a9
feat: bulk api allow to add multiple patients asynchronously
m-benamor Dec 21, 2020
3072e88
Merged in feature/addPatientBatchMode (pull request #173)
m-benamor Jan 26, 2021
5e07574
Initializer for SRL - compiled, not tested
May 14, 2018
31eaf55
Read parameters for initializer from Mainzelliste Config
galinatremper May 18, 2018
a67b057
Updated json with data from Mainzelliste config
May 24, 2018
00af34b
[SRL] Small changes in initializer, new ID type for SRL, draft for co…
galinatremper May 25, 2018
c09d023
Updated communicator structure, functions, documentation, added rest …
Jun 1, 2018
682f29c
Rest-enpoint updates + Fake Json respone for test purpose
StampeFlorian Jun 1, 2018
6e15bcc
[SRL] Read all patients from Mainzelliste and transformed in Communic…
galinatremper Jun 1, 2018
339d039
Add updatePatient template
StampeFlorian Jun 4, 2018
b6b2be5
Added failure handling, failure logging, First version of linkCallBac…
StampeFlorian Jun 4, 2018
446f393
Added initializer config and edited method for creating local init js…
Jun 4, 2018
ebb9afa
add authorizationValidator function + used in /getAllRecords and /lin…
StampeFlorian Jun 4, 2018
e04a81d
Extract doRequest from Initializer function and added into an own class
StampeFlorian Jun 4, 2018
e09a396
Changed from JSONObject to JSONArray
StampeFlorian Jun 4, 2018
7d0bd23
Changed from JSONObject to JSONArray + read URLValues
StampeFlorian Jun 4, 2018
d33c964
Merge remote-tracking branch 'origin/srl' into srl
StampeFlorian Jun 4, 2018
9688855
Added initializer config files and changed the fallback in config to …
Jun 5, 2018
52b7401
process REST request parameters & add REST paging functionality
StampeFlorian Jun 6, 2018
0e009a8
[SRL] Added sending request if an srl temp id was created, corrected …
galinatremper Jun 6, 2018
1628108
sendLinkRecord change + setEscapeForwardSlashAlways, Log changed
StampeFlorian Jun 7, 2018
260afa3
Initializer send remoteInitJson
StampeFlorian Jun 7, 2018
402ef2f
[SRL] Transformation of name fields
galinatremper Jun 7, 2018
f3e28c2
Bloomfilter
Jun 7, 2018
5fa3cbb
[SRL] Fixed NullPointerException
galinatremper Jun 7, 2018
c08ffcb
changed version of jaxb and commented out the sendRequests
Jun 7, 2018
68483ec
[SRL] Solved problem with BloomFilter empty fields
galinatremper Jun 7, 2018
fe391ab
Merge branch 'srl' of https://code.mitro.dkfz.de/scm/prob/mainzellist…
galinatremper Jun 7, 2018
376580b
process REST request parameters & add REST paging functionality
StampeFlorian Jun 7, 2018
ceb4147
[SRL] BloomFilter transformation applied for linkRecord
galinatremper Jun 7, 2018
6ce752e
Merge remote-tracking branch 'origin/srl' into srl
StampeFlorian Jun 7, 2018
5223de3
Try-Catch handling for Initializer.
StampeFlorian Jun 7, 2018
ff6a82f
BitSet to Byte[]
Jun 7, 2018
ac60d65
Merge remote-tracking branch 'origin/srl' into srl
Jun 7, 2018
a1fab1e
Load SRL values from config file
Jul 5, 2018
d524cb4
Load SRL values from config file
Jul 5, 2018
6bdc028
code clean up and syntax optimization
Jul 5, 2018
3b9952d
Configuration examples
Jul 9, 2018
023d114
Fix API-keyNames
Jul 13, 2018
3d168be
change url type to string
Jul 13, 2018
839a6ca
add local server configs
Jul 13, 2018
05c3bcf
fix init component, added values for remoteInitJson, added logs
Jul 13, 2018
6289c39
add ids to patient records
Jul 13, 2018
56dd051
Added minor changes, added additional logd and added TODOs
Jul 16, 2018
8717cc0
Null values in JSON, small changes in Initializer
galinatremper Jul 23, 2018
cba91e0
[SRL-6,7] linkRecord und getAllPatients angepasst
galinatremper Jul 30, 2018
687301b
Added minor changes, added additional logd and added TODOs
Jul 30, 2018
00f6ff5
RemoteID in Link as a injected parameter, add TODO for sendLinkRecord…
Jul 30, 2018
ef8f7cf
Config changed to fit new API
Jul 30, 2018
b82a6c5
[SRL] Configuration splitted in mainzelliste.conf and sel.conf, proxy…
galinatremper Aug 6, 2018
d54bcbd
[SRL] The first draft for matchRecord and matchCallBack (counting not…
galinatremper Aug 13, 2018
b73f424
[SRL] Add data service url to configuration
galinatremper Aug 14, 2018
d9ff5ba
Config changes
Aug 14, 2018
0fdd797
add REST-API to start matching process
Aug 14, 2018
1056fbb
logs and minimal changes
Aug 14, 2018
9745014
[SRL] Add callback Urls to config
galinatremper Aug 14, 2018
38abbbe
[SRL] Calculate shared key from apiKey, corrected apiKey in local init
galinatremper Aug 17, 2018
d44dd98
add REST function triggerMatchStatus
StampeFlorian Aug 21, 2018
042c6a2
add match Counter v 0.1
StampeFlorian Aug 21, 2018
c891a8e
update match counter implementation
Aug 28, 2018
7b6acd6
Add retry logic for database connection on startup. -> merged from ht…
Aug 29, 2018
37885f0
[SRL] Send records to link (M:N Linkage)
galinatremper Oct 15, 2018
a70c82b
Added localAuthenticationType as config variable
Oct 16, 2018
c4c07af
Merge remote-tracking branch 'origin/srl' into srl
Oct 16, 2018
4306be6
Fixed "localAuthentication" Bug SRL-14
Oct 16, 2018
8cb50b2
[SRL] Added temporal ID generation to linkRecords
galinatremper Oct 16, 2018
9186186
Merge branch 'srl' of https://code.mitro.dkfz.de/scm/prob/mainzellist…
galinatremper Oct 16, 2018
17a1809
Implemented new AuthorizationValidator
Oct 16, 2018
da01601
Merge remote-tracking branch 'origin/srl' into srl
Oct 16, 2018
6aa34f0
added validation for triggerMatch and triggerLink
StampeFlorian Oct 17, 2018
e363e8d
[SRL] Corrected reset in SRL ID Generator
galinatremper Oct 18, 2018
12b6916
Merge branch 'srl' of https://code.mitro.dkfz.de/scm/prob/mainzellist…
galinatremper Oct 18, 2018
f92398d
[SRL] linkCallback (Communicator part)
galinatremper Oct 18, 2018
c82bbe2
new sel.conf.default
Oct 19, 2018
bdcbeac
add Access-Control-Allow-Methods, Access-Control-Allow-Headers so Jav…
StampeFlorian Nov 5, 2018
ff39dcc
[SRL] linkCallBack - new linkageIds are stored now in DB (old Ids are…
galinatremper Nov 5, 2018
3e8de4c
Merge branch 'srl' of https://code.mitro.dkfz.de/scm/prob/mainzellist…
galinatremper Nov 5, 2018
d0a4a93
deactivate validation temporarily integration_tests
Nov 16, 2018
c4a1a5d
add header temporarily
Nov 16, 2018
1c9920b
matchMode draft
Nov 19, 2018
444b416
[SRL] Added linkage service to configuration
galinatremper Nov 21, 2018
e18bf3c
Merge branch 'srl' of https://code.mitro.dkfz.de/scm/prob/mainzellist…
galinatremper Nov 21, 2018
712caf9
delete comments
Nov 26, 2018
6ce6db7
Renamed SendHelper to HTTPSendHelper, added eader helper class
Nov 29, 2018
f8a7d60
move initLogger() call
Nov 29, 2018
f404f64
add header to local init call and extract initializeLocalSecureEpiLin…
Nov 29, 2018
56872d4
HTTPSendHelper now returns ClosableHttpResponse
Nov 30, 2018
268b3f4
Renamings and reorganizing
Nov 30, 2018
02c5a08
Extract ArrayListAdding to own class
Nov 30, 2018
ccf125f
added auth-header to post requests
Nov 30, 2018
79ba24f
fix in apikey & fix in json record list generating
Dec 3, 2018
e6e00c1
[SRL] Save fresh IDs in the Setup Step in Mainzelliste
galinatremper Dec 17, 2018
80b4099
BugFix in adding new IDs
Dec 19, 2018
efd1534
Deactivate Integer testing, because IDs are Strings
Dec 19, 2018
9093b8f
log changes and small reorganizations
Dec 19, 2018
028a8bd
added linkageService to remoteJson, added logs, small name refactorin…
Jan 29, 2019
5f678e9
Added authentication(authTyp and sharedKey) to linkageServiceAuthenti…
Jan 30, 2019
241a518
extract methods refactorings
Jan 31, 2019
4fe3ea6
add Disclaimer
StampeFlorian Sep 25, 2019
fb09577
update Disclaimer
StampeFlorian Sep 25, 2019
fb2c0a6
Update README.md
StampeFlorian Nov 5, 2019
dad52b6
Update README.md
StampeFlorian Nov 5, 2019
9ef4ea0
Adds lost license file
StampeFlorian Nov 18, 2019
302c813
Merge branch 'development' into feature/MainzellisteSEL
galinatremper Feb 8, 2021
3cdd08e
[feature/MainzellisteSEL] Fixed logging initializer
galinatremper Feb 8, 2021
7725ebd
[feature/MainzellisteSEL] Small changes in pom.xml
galinatremper Feb 11, 2021
56085ee
fix: Updated dependency for Jaxb and methods accessed by samply.commo…
torbrenner Feb 11, 2021
71cb065
Add renovate.json
renovate[bot] Dec 15, 2023
1c11270
Merge pull request #2 from cerbelding/feature/MainzellisteSEL
cerbelding Oct 14, 2024
a98be5e
Revert "Feature/mainzelliste sel"
cerbelding Oct 14, 2024
9f4ba44
Merge pull request #4 from cerbelding/revert-2-feature/MainzellisteSEL
cerbelding Oct 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
]
}