Commits · main · Laura Ondušková / PA165 Team Delta

May 24, 2023
- Merge branch 'dev' into 'main' · 478b396c
  Martin Hesko authored May 24, 2023
```
Milestone 4

See merge request !60
```
  478b396c
May 23, 2023
- Merge branch 'readme-diagram-fix' into 'dev' · 14269f3d
  Martin Pernica authored May 23, 2023
```
Readme diagram fix

See merge request !59
```
  14269f3d
- Fixed diagram in readme to fit current code · fd6e61da
  xpernic1 authored May 23, 2023
  
  fd6e61da
- Merge branch 'locust-add-tasks' into 'dev' · 74be981b
  Martin Kyjac authored May 23, 2023
```
Locust add tasks

See merge request !58
```
  74be981b
- Put default text hint into bearer.txt · db956550
  Martin Kyjac authored May 23, 2023
  
  db956550
- Fix ProduceWineServiceTest · f7f1c5c2
  Martin Kyjac authored May 23, 2023
  
  f7f1c5c2
- Update readme · 7b215012
  Martin Kyjac authored May 23, 2023
  
  7b215012
- Update locust scenarios · 66510635
  Martin Kyjac authored May 23, 2023
  
  66510635
- Fix URL calling api · 093bc019
  Martin Kyjac authored May 23, 2023
  
  093bc019
- Bugfixing · 8eb834a0
  Martin Kyjac authored May 23, 2023
  
  8eb834a0
May 22, 2023
- Fix can store method sum capacity calculation · 4f4bbdc7
  Martin Kyjac authored May 22, 2023
  
  4f4bbdc7
May 21, 2023
- Delete pycache · d31297db
  Martin Kyjac authored May 21, 2023
  
  d31297db
- Add multiple tasks for each service · a254eb52
  Martin Kyjac authored May 21, 2023
  
  a254eb52
May 08, 2023
- Merge branch 'dev' into 'main' · 0a2469ac
  Martin Kyjac authored May 08, 2023
```
Milestone 3

See merge request !57
```
  0a2469ac
May 07, 2023
- Merge branch 'locust-integration' into 'dev' · c9b8c498
  Martin Kyjac authored May 07, 2023
```
Add one simple locust scenario

See merge request !56
```
  c9b8c498
- Add scenario to the README.md · 03a296dd
  Laura Ondušková authored May 07, 2023
  
  03a296dd
- Remove bearer from bearer.txt · 8ed835a5
  Martin Kyjac authored May 07, 2023
  
  8ed835a5
- Update README · be6bbc5a
  Martin Kyjac authored May 07, 2023
  
  be6bbc5a
- Add grape and harvest task with locust · 7d01432e
  Martin Kyjac authored May 07, 2023
  
  7d01432e
- Merge branch 'sellwine-refactor' into 'dev' · 78e7c1cf
  Martin Hesko authored May 07, 2023
```
refactor: Added complex return types to all sell-wine calls

See merge request !55
```
  78e7c1cf
- Merge branch 'harvestwine+producewine-data-init-fix' into 'dev' · 517e5f98
  Martin Hesko authored May 07, 2023
```
Add - data initialization for wine production and harvest

See merge request !54
```
  517e5f98
- refactor: Added complex return types to all sell-wine calls · 01eefcef
  Martin Hesko authored May 07, 2023
  
  01eefcef
- removed harvest wine controller tests · 0c13df76
  xpernic1 authored May 07, 2023
  
  0c13df76
- Add - data initialization for store wine · b9af85c0
  xpernic1 authored May 07, 2023
  
  b9af85c0
- Add - data initialization for wine production and harvest · 3927e435
  xpernic1 authored May 07, 2023
  
  3927e435
- Merge branch 'producewine-init+retype' into 'dev' · 68eec756
  Martin Hesko authored May 07, 2023
```
Add - data initialization for wine production

See merge request !52
```
  68eec756
- Merge branch 'sellwine-refactor' into 'dev' · 04d90367
  Martin Hesko authored May 07, 2023
```
Refactoring sell-wine + Bottle change to BigDecimal

See merge request !51
```
  04d90367
- Fix datatype in dependent function · 9be7a702
  Martin Hesko authored May 07, 2023
  
  9be7a702
- Add - data initialization for wine production · 2d37a6d3
  xpernic1 authored May 07, 2023
```
changed type from float to BigDecimal to be more precise
```
  2d37a6d3
- Fix surplus value method · 20ffabcd
  Laura Ondušková authored May 07, 2023
  
  20ffabcd
- fix: adjusted functions in harvest-management to use BigDecimal · 12248923
  Martin Hesko authored May 07, 2023
  
  12248923
- fix: Updated store-wine to work with BigDecimal in Bottle · 483cc5c4
  Martin Hesko authored May 07, 2023
  
  483cc5c4
- fix: sell-wine tests adjusted to the BigDecimal values in Bottle · 2a9c3eeb
  Martin Hesko authored May 07, 2023
  
  2a9c3eeb
- Add - data initialization · 333aeede
  xpernic1 authored May 07, 2023
```
changed type from float to BigDecimal to be more precise
```
  333aeede
- Removed Purchase from sell-wine, functionality replaced by Order · 3c42adc0
  Martin Hesko authored May 07, 2023
  
  3c42adc0
- Fix displaying 2 authorization methods in swagger UI · 1b5065f4
  Martin Kyjac authored May 07, 2023
  
  1b5065f4
- Merge branch 'oauth-integration' into 'dev' · 11874d20
  Martin Kyjac authored May 07, 2023
```
Oauth integration

See merge request !46
```
  11874d20
- Add bearer token to HarvestFacadeImpl methods · f079f9c1
  Martin Kyjac authored May 07, 2023
  
  f079f9c1
- Merge branch 'dev' into oauth-integration · c59a36f0
  Martin Kyjac authored May 07, 2023
```
# Conflicts:
#	winery/harvest-management/src/main/java/org/delta/winery/harvestwine/controllers/HarvestController.java
#	winery/harvest-management/src/main/java/org/delta/winery/harvestwine/facade/HarvestFacade.java
#	winery/harvest-management/src/main/java/org/delta/winery/harvestwine/service/HarvestManagementService.java
#	winery/harvest-management/src/main/java/org/delta/winery/harvestwine/service/HarvestManagementServiceImpl.java
```
  c59a36f0
- Fixing ports and configs after merging DEV · 45c59070
  Martin Kyjac authored May 07, 2023
  
  45c59070