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.

Sign up for GitHub

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

Jump to bottom

Merge develop for release 1.14.0 #434

Merged
merged 132 commits into from
Feb 18, 2024
Merged

Merge develop for release 1.14.0 #434

merged 132 commits into from
Feb 18, 2024

Conversation

mwithi
Copy link
Member

@mwithi mwithi commented Feb 18, 2024

Merge develop for release 1.14.0

dbmalkovsky and others added 30 commits June 14, 2023 17:46
@dbmalkovsky
Chore: update copyright year (#286)
781ca0b
@mwithi
OP-1104 Fix session audit update upon logout from UI (#283)
fa4d6c4 
* Fix HttpSession usage for session audit

- enable setAllowCredentials(true)
- replace setAllowedOrigins(Arrays.asList("*")) with
addAllowedOriginPattern("*") for CORS

* Set HttpOnly cookies for Spring sessions.

Set HTTPS flag "secure" commented, if required

* Add comment
@dbmalkovsky
Chore: remove unused import (#287)
9c5a820
@mwithi
OP-1113 Create PID file for controlling API from scripts (#289)
7d824a3 
* OP-1113 Create PID file for controlling API from scripts

* Changed the pid filename to a placeholder (it works also as filename)
@mwithi
Update pom.xml with -SNAPSHOT
83b6b9a
@mwithi
Merge pull request #291 from informatici/release_1_13_0
bf96a5f 
Merge "back" after release 1.13.0
@dbmalkovsky
Chore: upgrade to Spring Boot 2.7.13 (#292)
130a602
@mwithi
Fix indentation
ebfd0a7
@ArnaudFonzam @mwithi @dbmalkovsky
OH2-205: Add code generation on Swagger (#290)
f46e15b 
* OH2-205: Add code generation on Swagger

* fix bug on swagger ui

* update the route of the api

* add response message on logout api

* upgrade swagger to v3

* format code on pom.xml

* format the code

* OH2-207: add pagination on opd controller

* remove format in all property date of DTO

* add securituRequirement on all controller

* OH2-208: update pageInfoDTO

* fix swagger error

* fix correct allowableValues on PatientDTO

* add response type on LoginController

* Update src/main/java/org/isf/shared/GenericMapper.java

* Update src/main/java/org/isf/login/rest/LoginController.java

* Update src/main/java/org/isf/lab/rest/LaboratoryController.java

* rename LoginApi to LogoutApi and remove LoginResponse in security package

* Update rsc/application.properties.dist

* Update src/main/java/org/isf/security/LogoutApi.java

* change Tag login to Logout

* Update README.md with Swagger 3 instructions (#77)

* Update src/main/java/org/isf/security/LogoutApi.java

Co-authored-by: ArnaudFonzam <[email protected]>
Co-authored-by: Alessandro Domanico <[email protected]>
Co-authored-by: David B Malkovsky <[email protected]>
@mwithi
OH2-205 Update README with api version 0.1.0
2789a57
@dependabot
Chore(deps): Bump org.springframework.boot:spring-boot-starter-parent
4db3d2a 
Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 2.7.13 to 2.7.14.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v2.7.13...v2.7.14)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-starter-parent
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dbmalkovsky
Merge pull request #298 from informatici/dependabot/maven/org.springf…
c7c7945 
…ramework.boot-spring-boot-starter-parent-2.7.14

Chore(deps): Bump org.springframework.boot:spring-boot-starter-parent from 2.7.13 to 2.7.14
@dbmalkovsky
Chore: remove unused import (#293)
71d713b
@dbmalkovsky
Chore: public modifier not needed for interfaces (#294)
e247cee
@dbmalkovsky
Chore: explicit type can be replaced with <> (#295)
eb6d51a
@dbmalkovsky
Chore: spelling corrections (#296)
9b00202
@ArnaudFonzam
OH2-225: API /laboratories/exams: did not display the data well (#299)
48c7b99 
* OH2-225

* fix error

* fix error in code

---------

Co-authored-by: ArnaudFonzam <[email protected]>
@ArnaudFonzam @mwithi
OH2-226: add param wardCode on api opd search (#300)
6b417e1 
* add property Ward in OpdDTO and add param WardCode on opd/search api

* fix all bugs

* update: src/main/java/org/isf/ward/dto/WardDTO.java

* update src/main/java/org/isf/opd/rest/OpdController.java

* format the code

* update :src/main/java/org/isf/opd/dto/OpdDTO.java

---------

Co-authored-by: ArnaudFonzam <[email protected]>
Co-authored-by: Alessandro Domanico <[email protected]>
@dbmalkovsky
Chore: fix Javadoc parameter references to match the code (#301)
b6778b1
@dbmalkovsky
Chore: Javadoc grammar changes (#302)
b159905
@dbmalkovsky
Chore: set method should return void (#303)
90b6b8d
@dbmalkovsky
Chore: remove file that is just one large comment; it is unused (#304)
c9e2931
@dbmalkovsky
Chore: remove unused class file (#305)
2b039d2
@dbmalkovsky
Chore: remove deprecated variable and associated methods (#306)
d9d5889
@dbmalkovsky
Chore: use isEmpty() instead of testing for size of the collection (#307
55d46de 
)
@dbmalkovsky
Chore: add missing Override annotation to method (#309)
5575391
@dbmalkovsky
Chore: narrow variable scope and/or move closer to actual use of vari…
939190f 
…able (#308)
@ArnaudFonzam
persist the opd ward that comes from the front-end (#310)
a7fffbf 
Co-authored-by: ArnaudFonzam <[email protected]>
@dbmalkovsky
Chore: collection should be an interface and not a concrete class (#311)
cddd30f
@dbmalkovsky
Chore: production code shouldn't be using printStackTrace() (#312)
0102890
ArnaudFonzam and others added 28 commits November 24, 2023 21:24
@ArnaudFonzam @mwithi @dbmalkovsky
OH2-249 | update User Controller (#392)
61d12c5 
* update user Controller

* update src/main/java/org/isf/menu/rest/UserController.java

* GitHub Action: update openapi

* update securityConfig and remove userSettingController

* update src/main/java/org/isf/config/SecurityConfig.java

* update oh.yaml

* Update src/main/java/org/isf/menu/rest/UserController.java

* remove api user/setting/dashboard

* Update src/main/java/org/isf/menu/rest/UserController.java

* format the code

* Apply code review suggestions

* Make variable names consistent

* Remove unnecessary check

---------

Co-authored-by: ArnaudFonzam <[email protected]>
Co-authored-by: Alessandro Domanico <[email protected]>
Co-authored-by: David B Malkovsky <[email protected]>
@dbmalkovsky
OP-1130 improve JPA methods - priceslist package (#404)
fdb1747
@mwithi @dbmalkovsky
OH2-254 Fix password and user update (#405)
569634f 
* Fix password and user update

* Rephrase logic

* Remove unnecessary check

* Apply suggestions from code review

---------

Co-authored-by: David B Malkovsky <[email protected]>
@dbmalkovsky
OP-1130 improve JPA methods - permissions package (#406)
4739253 
* OP-1130 improve JPA methods - permissions package

* OP-1130 improve JPA methods - permissions package

* Update UserDetailsServiceImpl.java
@dbmalkovsky
OP-1130 improve JPA methods - menu package (#407)
cd6439d
@dbmalkovsky
OP-1130 improve JPA methods - menu package (#408)
4b3dc27
@mwithi
OH2-249 Fix PUT /users/settings/{id}
4559044
@mwithi
Fix responseCode when userSetting not found (#409)
122e543
@mwithi
Add "How to generate opeanpi specs" chapter
86b5987
@dbmalkovsky
OP-1130 improve JPA methods - medicalstock package (#410)
d778d57
@ArnaudFonzam @mwithi
OH2-258 | Change the value of enum LaboratoryStatus in lowercase (#412)
9a002a2 
* update LaboratoryController

* Update src/main/java/org/isf/lab/rest/LaboratoryController.java

* Capitalize private static final String

---------

Co-authored-by: ArnaudFonzam <[email protected]>
Co-authored-by: Alessandro Domanico <[email protected]>
@dbmalkovsky
Chore: fix spelling (#413)
923fa1d
@dbmalkovsky
OP-1130 improve JPA methods - operation package (#414)
4bab4b7
@mwithi
Update to latest setting.properties
9e58a55
@mwithi
Workaround to fix validation error waiting for OH2-182 (#417)
ac3e7b2
@dependabot
Chore(deps): Bump com.fasterxml.jackson.module:jackson-modules-java8
2eda37b 
Bumps [com.fasterxml.jackson.module:jackson-modules-java8](https://github.com/FasterXML/jackson-modules-java8) from 2.16.0 to 2.16.1.
- [Commits](FasterXML/jackson-modules-java8@jackson-modules-java8-2.16.0...jackson-modules-java8-2.16.1)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.module:jackson-modules-java8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@ArnaudFonzam @mwithi
OH2-252 | Fix audit logging from API (#418)
8bfd402 
* Fix audit logging from API

* update src/main/java/org/isf/login/rest/LoginController.java

* update LoginController and fix bug on OperationController

* update LoginController

* remove HttpSession import and use UserSession to set user and sessionAuditId

* update src/main/java/org/isf/login/rest/LoginController.java

* update src/main/java/org/isf/security/CustomLogoutHandler.java

* Revert "update src/main/java/org/isf/login/rest/LoginController.java"

This reverts commit e6a6ba7.

* Rollback HttpSession usage and implement a CustomAuditorAwareImpl

different from the GUI one (that will use the Default one)

* Fix comments

* Rename class

* Add license header

---------

Co-authored-by: ArnaudFonzam <[email protected]>
Co-authored-by: mwithi <[email protected]>
@dbmalkovsky
Merge pull request #419 from informatici/dependabot/maven/com.fasterx…
f16a323 
…ml.jackson.module-jackson-modules-java8-2.16.1

Chore(deps): Bump com.fasterxml.jackson.module:jackson-modules-java8 from 2.16.0 to 2.16.1
@mwithi @dbmalkovsky
Fix: update README.md with screenshots (#420)
fcc7215 
* Update README.md (Fix screenshots)

* Update project description

* Update first screenshot

* Apply suggestions from code review

---------

Co-authored-by: David B Malkovsky <[email protected]>
@mwithi @npasquetto
OH2-255 Revise and align permissions for CORE, API and UI (#411)
0c626cb 
* General refactoring of endpoints, permissions and security.

- remove duplicates
- added missing
- refactored some controllers and endpoints (resources in plurals)
- made permission spelled like endpoint
- sorted in alphabetical order, then CRUD
- removed PATCH methods

* Move /discharges to /admissions/discharges endpoint

and so remove discharges.* permissions, admission.* ones will be used.

* Fix one typo "visitss"

* Update PR #411 (#415)

* Modify duplicate @PostMapping in VisitsController
Update oh.yaml
Fix Tests

* Removed "// TODO Auto-generated method stub" comments

* Remapped /visit(s) endpoint

* Align with develop

---------

Co-authored-by: Niccolò Pasquetto <[email protected]>
@mwithi @dbmalkovsky
OP-312 Telemetry Module (#416)
c9abec2 
* Update setting.properties

* Add telemetry.properties

---------

Co-authored-by: David B Malkovsky <[email protected]>
@Th0rst3nH @mwithi
OP-1016 Upgrade to java 17 and upgraded maven (#394)
be6c724 
* upgrade to java 17 and upgraded maven

* cleanup

* revert oh-core version back to 1.13.0-SNAPSHOT to pass test in github action

* GitHub Action: update openapi

* Update core artifact

---------

Co-authored-by: thhaga <[email protected]>
Co-authored-by: mwithi <[email protected]>
@dbmalkovsky
Chore: update maven.yml for JDK 17 (#427)
ef414e7
@dbmalkovsky
Chore: fix maven.yml for JDK 17 (#428)
ec3a6ef
@mwithi
OP-336 Convert test to junit5 and test contextLoads() method (#429)
6acd1bf 
* Restore contextLoads() test

* Convert LaboratoryControllerTest to JUnit5

* Comment out the test and update the comment with suggestion
@dependabot
Chore(deps): Bump org.modelmapper:modelmapper from 3.1.1 to 3.2.0 (#362)
ca8ef01 
Bumps [org.modelmapper:modelmapper](https://github.com/modelmapper/modelmapper) from 3.1.1 to 3.2.0.
- [Changelog](https://github.com/modelmapper/modelmapper/blob/master/CHANGES.md)
- [Commits](modelmapper/modelmapper@modelmapper-parent-3.1.1...modelmapper-parent-3.2.0)

---
updated-dependencies:
- dependency-name: org.modelmapper:modelmapper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mwithi
Chore: update license headers
df958c9
@mwithi
Remove -SNAPSHOT
f68d8d3
@mwithi mwithi merged commit b714550 into master Feb 18, 2024
0 of 3 checks passed
@mwithi mwithi deleted the release_1_14_0 branch February 18, 2024 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@mwithi @dbmalkovsky @ArnaudFonzam @Tudor44 @Th0rst3nH