Commits · master · Tomáš Královič / PA165-airport-management

May 26, 2024
- Merge branch 'docker-compose-readme-improvements' into 'master' · d57a6f44
  Tomáš Královič authored May 26, 2024
```
Docker compose and readme modifications

See merge request !32
```
  d57a6f44
- update readme · e028b9e7
  Tomáš Královič authored May 26, 2024
  
  e028b9e7
- Confidential client run by docker-compose · 9768f29d
  Tomáš Královič authored May 26, 2024
  
  9768f29d
- Merge branch 'resolve-conflicts-between-dev-main' into 'master' · 2eb1359d
  Tomáš Královič authored May 26, 2024
```
Resolve conflicts between dev main

See merge request !31
```
  2eb1359d
- Fix errors from merge conflicts · 047339e4
  Tomáš Královič authored May 26, 2024
  
  047339e4
- Merge branch 'refs/heads/master' into resolve-conflicts-between-dev-main · 879e9c39
  Tomáš Královič authored May 26, 2024
```
# Conflicts:
#	flight-management/src/main/java/cz/muni/fi/pa165/flights/service/FlightService.java
#	flight-management/src/test/java/cz/muni/fi/pa165/flights/service/FlightServiceTest.java
#	resources-management/src/main/java/cz/muni/fi/pa165/resources/service/AirplaneService.java
#	resources-management/src/main/java/cz/muni/fi/pa165/resources/service/DestinationService.java
```
  879e9c39
- Merge branch 'fixes-before-m4' into 'development' · 5beb8a5c
  Tomáš Královič authored May 26, 2024
```
create confidential client, add checking airplane availability and some more small fixes

See merge request !26
```
  5beb8a5c
- Fix errors from merge conflicts · 588d6ff4
  Tomáš Královič authored May 26, 2024
  
  588d6ff4
- Merge branch 'refs/heads/development' into fixes-before-m4 · 506b1d03
  Tomáš Královič authored May 26, 2024
```
# Conflicts:
#	flight-management/src/main/java/cz/muni/fi/pa165/flights/service/FlightService.java
#	flight-management/src/test/java/cz/muni/fi/pa165/flights/service/FlightServiceTest.java
```
  506b1d03
- Merge branch 'fix-status-codes' into 'development' · 65d6a58a
  Tomáš Královič authored May 26, 2024
```
M4 fixes

See merge request !29
```
  65d6a58a
- Fix issues from MR reviews · 2077d9b7
  Tomáš Královič authored May 26, 2024
  
  2077d9b7
- fix message for added seats · cef6821c
  Zofia Tunova authored May 26, 2024
  
  cef6821c
- add more plane seats · 4ab13ca3
  Zofia Tunova authored May 26, 2024
  
  4ab13ca3
- Merge branch 'flight-management-refactor' into 'master' · 473264f1
  Jan Nouza authored May 26, 2024
```
Flight management refactor

See merge request !28
```
  473264f1
- Merge branch 'resources-management' into 'master' · d34edb36
  Jan Nouza authored May 26, 2024
```
Resources management refactor

See merge request !27
```
  d34edb36
- add missing info how to run locust file · d6cb98f1
  Zofia Tunova authored May 26, 2024
  
  d6cb98f1
- fix handling of id in contact dto when creating new contact · 6da5c6f7
  Zofia Tunova authored May 26, 2024
  
  6da5c6f7
- validate destination · e1bf1ee3
  Zofia Tunova authored May 26, 2024
  
  e1bf1ee3
- validate airplane · a660d654
  Zofia Tunova authored May 26, 2024
  
  a660d654
- Some fixes · 4c7cb7b8
  Tomáš Královič authored May 26, 2024
  
  4c7cb7b8
May 25, 2024
- Check plane availability · f2493a11
  Tomáš Královič authored May 25, 2024
  
  f2493a11
- fix exception for not found resources · fc44e4d7
  Zofia Tunova authored May 25, 2024
  
  fc44e4d7
- make create airplane and destination return 201 · b8ec25aa
  Zofia Tunova authored May 25, 2024
  
  b8ec25aa
- make create flight return 201 · d47890f0
  Zofia Tunova authored May 25, 2024
  
  d47890f0
- make delete return 204 and void (no content) · 35e60af1
  Zofia Tunova authored May 25, 2024
  
  35e60af1
- Remove mapper injection in service layer · 7ac3cc38
  Jan Nouza authored May 25, 2024
  
  7ac3cc38
- handle 4xx status codes from resources service · f6323259
  Zofia Tunova authored May 25, 2024
  
  f6323259
- Add lombok usage · a6bac5a3
  Jan Nouza authored May 25, 2024
  
  a6bac5a3
- handle 4xx status codes from flight service · 7aac2a80
  Zofia Tunova authored May 25, 2024
  
  7aac2a80
- Fix unit tests · 2422ad79
  Jan Nouza authored May 25, 2024
  
  2422ad79
- Update read me · 74b59d67
  Tomáš Královič authored May 25, 2024
  
  74b59d67
- prepare dockerfile and change used port in confidential client · 76bcaac6
  Tomáš Královič authored May 25, 2024
  
  76bcaac6
- Correctly handle user-given IDs · 15606a04
  Jan Nouza authored May 25, 2024
  
  15606a04
- confidential client · 794ed86a
  Tomáš Královič authored May 25, 2024
  
  794ed86a
- Merge branch 'containerization' into 'master' · 059f93cb
  Jan Nouza authored May 25, 2024
```
Containerization

See merge request !25
```
  059f93cb
- Remove mvn clean install instruction from README · fd4fdb6f
  Jan Nouza authored May 25, 2024
  
  fd4fdb6f
- Remake docker containerization to include packaging · aef94c07
  Jan Nouza authored May 25, 2024
  
  aef94c07
May 10, 2024
- Merge branch 'development' into 'master' · 5124ce6c
  Tomáš Královič authored May 10, 2024
```
Milestone 3

See merge request !24
```
  5124ce6c
- Merge branch 'stewards' into 'development' · d1dd4531
  Tomáš Královič authored May 10, 2024
```
Mostly security and locust scenario

See merge request !23
```
  d1dd4531
- Merge remote-tracking branch 'origin/stewards' into stewards · 0e4bb064
  Zofia Tunova authored May 10, 2024
  
  0e4bb064