Commits · 840447cff2e2667ab022adfc8261dee9021b64a8 · Laura Ondušková / PA165 Team Delta

Apr 15, 2023
- Added Store repository · 840447cf
  Vojtěch Peschel authored Apr 15, 2023
  
  840447cf
- Updated UpdateBottleDTO · b9d3dfd4
  Vojtěch Peschel authored Apr 15, 2023
  
  b9d3dfd4
- Added implementation to StoreWineService · 692e79ed
  Vojtěch Peschel authored Apr 15, 2023
  
  692e79ed
- Fixed controller · 5d8b6466
  Vojtěch Peschel authored Apr 15, 2023
  
  5d8b6466
- Updated DTOs of bottle · 2fd4ab9c
  Vojtěch Peschel authored Apr 15, 2023
  
  2fd4ab9c
Mar 26, 2023
- Merge branch '1-create-harvestwine-service-fix' into 'dev' · 78360569
  Martin Hesko authored Mar 26, 2023
```
Create HarvestWine Service

See merge request !15
```
  78360569
- updated pom to include harvest and grape management · ac2d09c1
  Martin Hesko authored Mar 26, 2023
  
  ac2d09c1
- resolving merge conflicts · 5a3baabe
  Martin Hesko authored Mar 26, 2023
  
  5a3baabe
- added tests for grape/harvest management · c5dcc569
  Martin Hesko authored Mar 26, 2023
  
  c5dcc569
- rebased branch on top of dev · 2eb07651
  xpernic1 authored Mar 26, 2023
  
  2eb07651
- resolving merge conflicts · 6d527c80
  xpernic1 authored Mar 26, 2023
  
  6d527c80
- running swager · df28da30
  Vojtěch Peschel authored Mar 26, 2023
  
  df28da30
- swagger test · 8bafabaf
  Vojtěch Peschel authored Mar 26, 2023
  
  8bafabaf
- resolving merge conflicts · 8bce47e2
  Vojtěch Peschel authored Mar 26, 2023
  
  8bce47e2
- rebased branch on top of dev · 149ef7c1
  xpernic1 authored Mar 26, 2023
  
  149ef7c1
- lehké přeformátování · 2f1ed37a
  xpernic1 authored Mar 25, 2023
  
  2f1ed37a
- úprava pro potřeby sklizně · 05123572
  xpernic1 authored Mar 25, 2023
  
  05123572
- přejmenování · 139fa97b
  xpernic1 authored Mar 25, 2023
  
  139fa97b
- snad · 57accede
  xpernic1 authored Mar 25, 2023
  
  57accede
- rebased branch on top of dev · e8b1dcde
  xpernic1 authored Mar 25, 2023
  
  e8b1dcde
- fixing wrong text directory hierarchy · 2fe07760
  Martin Hesko authored Mar 26, 2023
  
  2fe07760
- removed artifacts from pom · 2ef9e36b
  Martin Hesko authored Mar 26, 2023
  
  2ef9e36b
- Merge branch 'potential-fix' into 'dev' · cf10f85d
  Martin Hesko authored Mar 26, 2023
```
create storewine service, fixed branch

See merge request !11
```
  cf10f85d
- Merge branch '2-create-producewine-service' into 'dev' · c0bdcbbd
  Martin Hesko authored Mar 26, 2023
```
Added ProduceWine service

See merge request !12
```
  c0bdcbbd
- Resolved conflicts · 71a7a74b
  Martin Hesko authored Mar 26, 2023
```
# Conflicts:
#   winery/dto/src/main/java/org/delta/dto/entities/bottle/AddBottleDTO.java
#   winery/dto/src/main/java/org/delta/dto/entities/bottle/BottleDTO.java
#   winery/dto/src/main/java/org/delta/dto/entities/bottle/UpdateBottleDTO.java
#   winery/winery.iml
```
  71a7a74b
- Maybe fixed · 98baec9d
  Vojtěch Peschel authored Mar 26, 2023
  
  98baec9d
- Merge conflict resolving, code written by Vojta · 4f5e25d6
  Martin Hesko authored Mar 26, 2023
  
  4f5e25d6
- Merge branch '4-create-sellwine-service' into 'dev' · ff4f8515
  Martin Hesko authored Mar 26, 2023
```
Created SellWine service

See merge request !9
```
  ff4f8515
- Add diagrams to README.md · 8199b076
  Laura Ondušková authored Mar 26, 2023
  
  8199b076
- Add diagrams · 32a15d6c
  Laura Ondušková authored Mar 26, 2023
  
  32a15d6c
- Add SellWineTests · 519ca7ff
  Laura Ondušková authored Mar 26, 2023
  
  519ca7ff
- Merge branch '5-create-manageaccount-service' into 'dev' · 87b5957d
  Martin Hesko authored Mar 26, 2023
```
Merge Manage Account Service

See merge request !8
```
  87b5957d
- updated winery.iml · 1bfdd309
  Martin Hesko authored Mar 26, 2023
  
  1bfdd309
- Added the sell-wine service · 5be424e6
  Martin Hesko authored Mar 26, 2023
  
  5be424e6
- added DTOs for purchases · 8c040122
  Martin Hesko authored Mar 26, 2023
  
  8c040122
- Added DTOs for Orders · a0ce320e
  Martin Hesko authored Mar 26, 2023
  
  a0ce320e
- added DTOs for wine bottles · af965646
  Martin Hesko authored Mar 26, 2023
  
  af965646
- added tests · bca9889a
  xpernic1 authored Mar 26, 2023
  
  bca9889a
- Added test to UserManagement · e5d38cbf
  Vojtěch Peschel authored Mar 26, 2023
  
  e5d38cbf
- Add WineProduction module and DTOs · 8be4b50a
  Laura Ondušková authored Mar 26, 2023
  
  8be4b50a

Admin message