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

Feat/msg data vaccination #762

Merged
merged 13 commits into from
May 2, 2022
Merged

Feat/msg data vaccination #762

merged 13 commits into from
May 2, 2022

Conversation

mad-nuts
Copy link
Contributor

No description provided.

@github-actions
Copy link

github-actions bot commented Apr 28, 2022

Unit Test Results

  51 files  +1    51 suites  +1   4m 40s ⏱️ + 1m 8s
309 tests +7  309 ✔️ +7  0 💤 ±0  0 ±0 

Results for commit 43b238d. ± Comparison against base commit 6c2dbaf.

♻️ This comment has been updated with latest results.

@@ -55,7 +55,7 @@ class IrisMessageControllerTest {
private IrisMessageBuilderWeb irisMessageBuilder;

@MockBean
IrisMessageDataProcessor irisMessageDataProcessor;
EventMessageDataProcessor irisMessageDataProcessor;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find it awkward when a test of the general message implementation uses a class from a special implementation. Here in the concrete it is also prevented that the Event...Processor is limited in the visibility.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The generic message data tests are executed using event message data only. The IrisMessageDataProcessors class is mocked and can't be used to automatically resolve the correct Processor. When using the IrisMessageDataProcessor interface, the tests fail as there are 2 Processors now (Event & Vaccination). Is there any way to make it work by using the Interface?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think so. There is no need to use @MockBean at this point. A simple @Mock is sufficient here.

I have already made the change.

@@ -47,7 +47,7 @@ class IrisMessageDataControllerTest {
private IrisMessageDataViewProvider irisMessageDataViewProvider;

@MockBean
IrisMessageDataProcessor irisMessageDataProcessor;
EventMessageDataProcessor irisMessageDataProcessor;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As in IrisMessageControllerTest.java.

@jekutzsche jekutzsche merged commit 64636ba into develop May 2, 2022
@jekutzsche jekutzsche deleted the feat/msg-data-vaccination branch May 2, 2022 12:28
jekutzsche pushed a commit that referenced this pull request Jun 22, 2022
# [1.6.0-rc.1](v1.5.1...v1.6.0-rc.1) (2022-06-22)

### Bug Fixes

* add support for multi-column sort query parameters (fixes broken table sort of iris-message list) ([9daf6a1](9daf6a1)), closes [#801](#801)
* **Dependencies:** Updates version of jackson-databind to fix the vulnerability: avd.aquasec.com/nvd/cve-2020-36518 ([84a4b04](84a4b04))
* **Deps:** updates Spring Boot to 2.6.6 to fix the vulnerability avd.aquasec.com/nvd/cve-2022-22965 ([46a50b5](46a50b5))
* fix dependabot security alert and update multiple npm dependencies ([7b71e64](7b71e64)), closes [#729](#729)
* fix e2e tests by correcting the spec order ([53fd088](53fd088)), closes [#764](#764)
* Fixes a validation error when changing user data of admins. This could lead to an admin not being able to change their data under certain circumstances (only admin and role not transferred with). ([61f6bc3](61f6bc3)), closes [#703](#703)
* ga-gotham config tls communication between internal eps ([4b6cf41](4b6cf41))
* removed line breaks at the end of certificates. ([64104a0](64104a0))

### Features

* For JSON-RPC calls (calls from EPS), the client name submitted by EPS is now used as user (if available). Thus, the metadata of records created via JSON-RPC now also contain a user as creator and it is easier to see by whom the data was created. ([71ff56f](71ff56f)), closes [#826](#826)
* **Messages:** Messages can now be used to exchange guests of events between health departments. This makes it possible to transmit the guests received through a data request to the responsible department. The data can be transferred directly from the event overview to a message or can also be added to a message as an attachment. This is the beginning, more data types will follow. ([9c3c8cd](9c3c8cd)), closes [#640](#640)
* **Messages:** Messages can now be used to exchange vaccination reports between health departments. This makes it possible to transmit received records to the appropriate department through a data transfer. The data can be transferred directly from the vaccination report overview to a message or can also be added as an attachment to a message. ([64636ba](64636ba)), closes [#762](#762)
* Old messages are deleted after a configurable time (default is after 180 days) with all associated data. ([d768632](d768632)), closes [#773](#773)
* The authentication tokens (JWT) now retain their validity beyond the restart of the IRIS client. This means that, ideally, users notice only little of a restart of the application. ([2442685](2442685)), closes [#804](#804)
* The client backend now also supports the use of a refresh token, which can be used to extend the short validity of the authentication. This makes it more convenient to use, especially in conjunction with a two-factor authentication. ([b20ed86](b20ed86)), closes [#803](#803)
* The client is now a bit more secure against attacks and authentication token (JWT) stealing. For this, the JWT is now transferred and processed in HTTP-only cookies. In this context, XSRF protection with XSRF-TOKEN cookies has also been enabled. ([ae25da8](ae25da8)), closes [#802](#802)
* Users are no longer deleted immediately, but marked as deleted. The marked users can no longer be used and are no longer displayed. However, the data is still available, for example, for working with the audit logs. After all references to the users are deleted according to the respective deadline or after a specified time, the users are finally anonymized. Procedure and time periods are configurable. ([a913eaf](a913eaf)), closes [iris-connect/iris-backlog#235](https://github.com/iris-connect/iris-backlog/issues/235) [#761](#761)
* Users can be marked as locked. This makes it possible to temporarily lock users when they are absent. The locked users are not deleted, they are still available in the overview, but cannot be used for a login. ([68d55ec](68d55ec)), closes [#775](#775)

### Reverts

* Revert "chore(Deps): removes unnecessary Postgres version (spring declares the same) and improves jackson dependency" ([90bb5fa](90bb5fa))
@jekutzsche
Copy link
Member

🎉 This PR is included in version 1.6.0-rc.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

jekutzsche pushed a commit that referenced this pull request Jun 30, 2022
# [1.6.0](v1.5.1...v1.6.0) (2022-06-30)

### Bug Fixes

* add support for multi-column sort query parameters (fixes broken table sort of iris-message list) ([9daf6a1](9daf6a1)), closes [#801](#801)
* Changes NGINX Content-Security-Policy configuration to allow data urls as image src and adds `data:` to the forbidden keywords. ([cedf240](cedf240)), closes [#862](#862)
* **Dependencies:** Updates version of jackson-databind to fix the vulnerability: avd.aquasec.com/nvd/cve-2020-36518 ([84a4b04](84a4b04))
* **Deps:** updates Spring Boot to 2.6.6 to fix the vulnerability avd.aquasec.com/nvd/cve-2022-22965 ([46a50b5](46a50b5))
* fix dependabot security alert and update multiple npm dependencies ([7b71e64](7b71e64)), closes [#729](#729)
* fix e2e tests by correcting the spec order ([53fd088](53fd088)), closes [#764](#764)
* Fixes a validation error when changing user data of admins. This could lead to an admin not being able to change their data under certain circumstances (only admin and role not transferred with). ([61f6bc3](61f6bc3)), closes [#703](#703)
* Fixes an occasional `ConstraintViolationException` that can only be caused by parallel processing of multiple requests from the same IP. ([71c1c98](71c1c98)), closes [#828](#828)
* ga-gotham config tls communication between internal eps ([4b6cf41](4b6cf41))
* HTTP status code is now set correctly for validation errors with JSON-RPC (400). Related to this, there is now a central place to handle exceptions with JSON-RPC and to configure the correct HTTP status code. ([e0b98f7](e0b98f7)), closes [#827](#827)
* removed line breaks at the end of certificates. ([64104a0](64104a0))
* When checking incoming and entered data for possible attacks, case is now ignored for keywords. ([a378e58](a378e58)), closes [#864](#864)

### Features

* For JSON-RPC calls (calls from EPS), the client name submitted by EPS is now used as user (if available). Thus, the metadata of records created via JSON-RPC now also contain a user as creator and it is easier to see by whom the data was created. ([71ff56f](71ff56f)), closes [#826](#826)
* In the `.env` (see `.env.sample`) now the configuration for the mail dispatch can be done. With this it is now possible to send notifications when new data has been transferred to the IRIS client (at the moment implemented for the data of an event). ([4310bd0](4310bd0)), closes [#557](#557) [#858](#858)
* **Messages:** Messages can now be used to exchange guests of events between health departments. This makes it possible to transmit the guests received through a data request to the responsible department. The data can be transferred directly from the event overview to a message or can also be added to a message as an attachment. This is the beginning, more data types will follow. ([9c3c8cd](9c3c8cd)), closes [#640](#640)
* **Messages:** Messages can now be used to exchange vaccination reports between health departments. This makes it possible to transmit received records to the appropriate department through a data transfer. The data can be transferred directly from the vaccination report overview to a message or can also be added as an attachment to a message. ([64636ba](64636ba)), closes [#762](#762)
* Old messages are deleted after a configurable time (default is after 180 days) with all associated data. ([d768632](d768632)), closes [#773](#773)
* The authentication tokens (JWT) now retain their validity beyond the restart of the IRIS client. This means that, ideally, users notice only little of a restart of the application. ([2442685](2442685)), closes [#804](#804)
* The client backend now also supports the use of a refresh token, which can be used to extend the short validity of the authentication. This makes it more convenient to use, especially in conjunction with a two-factor authentication. ([b20ed86](b20ed86)), closes [#803](#803)
* The client is now a bit more secure against attacks and authentication token (JWT) stealing. For this, the JWT is now transferred and processed in HTTP-only cookies. In this context, XSRF protection with XSRF-TOKEN cookies has also been enabled. ([ae25da8](ae25da8)), closes [#802](#802)
* Users are no longer deleted immediately, but marked as deleted. The marked users can no longer be used and are no longer displayed. However, the data is still available, for example, for working with the audit logs. After all references to the users are deleted according to the respective deadline or after a specified time, the users are finally anonymized. Procedure and time periods are configurable. ([a913eaf](a913eaf)), closes [iris-connect/iris-backlog#235](https://github.com/iris-connect/iris-backlog/issues/235) [#761](#761)
* Users can be marked as locked. This makes it possible to temporarily lock users when they are absent. The locked users are not deleted, they are still available in the overview, but cannot be used for a login. ([68d55ec](68d55ec)), closes [#775](#775)
* Users can now use two-factor authentication with time-based one-time password (TOTP). If it is enabled, a TOTP is expected and verified by a corresponding app after the conventional login. To set up the app, the user is displayed a QR code by IRIS. It is also possible for the admin to activate this mandatorily via environment variable. If a 2FA is expected but has not yet been finally configured for a user with a successful verification, the QR code is displayed after the successful conventional login and the verification is performed. ([03b915c](03b915c)), closes [iris-connect/iris-backlog#251](https://github.com/iris-connect/iris-backlog/issues/251) [#840](#840)

### Reverts

* Revert "chore(Deps): removes unnecessary Postgres version (spring declares the same) and improves jackson dependency" ([90bb5fa](90bb5fa))
@jekutzsche
Copy link
Member

🎉 This PR is included in version 1.6.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants