Commits · 624438de8d54cef1d9c6f85739936cc96332ed15 · Samuel Dudík / PA165 Winery Management System

10 Apr, 2022 1 commit
- Change to multimodule project · 624438de
  Ondřej Pavlica authored Apr 10, 2022
  
  624438de
27 Mar, 2022 29 commits
- Merge branch 'feature/balga/comments' into 'main' · f034d6e2
  Ondřej Pavlica authored Mar 27, 2022
```
Types converted to primitive, comments added

See merge request !18
```
  f034d6e2
- Types converted to primitive, comments added · 7c89ef8c
  Jakub Balga authored Mar 27, 2022
  
  7c89ef8c
- Merge branch 'feature/korenkova/milestone1/comments' into 'main' · c1954b95
  Ondřej Pavlica authored Mar 27, 2022
```
added comments

See merge request !17
```
  c1954b95
- added comments · 83aef2f2
  Michaela Korenková authored Mar 27, 2022
  
  83aef2f2
- Fix validation attributes · d60088fd
  Ondřej Pavlica authored Mar 27, 2022
  
  d60088fd
- Merge branch 'feature/balga/nonNullable' into 'main' · 85963a56
  Ondřej Pavlica authored Mar 27, 2022
```
Feature/balga/non nullable

See merge request !16
```
  85963a56
- Merge branch 'main' into feature/balga/nonNullable · 088c0e32
  Jakub Balga authored Mar 27, 2022
  
  088c0e32
- Columns not nullable, tests repaired · fca19c94
  Jakub Balga authored Mar 27, 2022
  
  fca19c94
- Fix actor names in use case diagram · 045ea5ff
  Samuel Dudík authored Mar 27, 2022
  
  045ea5ff
- Failed to load appContext · dd1e8c4f
  Jakub Balga authored Mar 27, 2022
  
  dd1e8c4f
- Merge remote-tracking branch 'origin/feature/korenkova/milestone1/tests' · 353f1c71
  Ondřej Pavlica authored Mar 27, 2022
```
# Conflicts:
#	winery/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/Order.java
```
  353f1c71
- created tests for harvest, grape and wineType · 9135fdc7
  Michaela Korenková authored Mar 27, 2022
  
  9135fdc7
- Merge branch 'feature/balga/daoTests' into 'main' · 9c0bf924
  Ondřej Pavlica authored Mar 27, 2022
```
Entity and DAO tests

See merge request !14
```
  9c0bf924
- Entity and DAO tests · af714cbb
  Jakub Balga authored Mar 27, 2022
  
  af714cbb
- Add build instructions to README.md · 35efeca8
  Samuel Dudík authored Mar 27, 2022
  
  35efeca8
- Remove duplicate dependency from pom.xml · 28a3a61f
  Samuel Dudík authored Mar 27, 2022
  
  28a3a61f
- Merge branch 'feature/entity-dao-tests/dudik' into 'main' · 3dbc9246
  Ondřej Pavlica authored Mar 27, 2022
```
Add tests for UserRole entity and DAO

See merge request !13
```
  3dbc9246
- Remove unused equals and hashCode methods from UserRole · 8876a609
  Samuel Dudík authored Mar 27, 2022
  
  8876a609
- Add tests for UserRole entity and DAO · 4ff57c73
  Samuel Dudík authored Mar 27, 2022
  
  4ff57c73
- Merge branch 'feature/entity-dao-tests/pavlica' into 'main' · 764f2959
  Ondřej Pavlica authored Mar 27, 2022
```
Add missing @author Javadocs

See merge request !12
```
  764f2959
- Add missing @author Javadocs · 7bd5eeff
  Ondřej Pavlica authored Mar 27, 2022
  
  7bd5eeff
- Ignore derby.log · cc6c63b8
  Ondřej Pavlica authored Mar 27, 2022
  
  cc6c63b8
- Merge branch 'feature/entity-dao-tests/pavlica' into 'main' · b94cef5a
  Ondřej Pavlica authored Mar 27, 2022
```
Add product review DAO tests

See merge request !11
```
  b94cef5a
- Add product review DAO tests · a149eb9e
  Ondřej Pavlica authored Mar 27, 2022
  
  a149eb9e
- Merge branch 'feature/balga/tests' into 'main' · 3f3a6c24
  Ondřej Pavlica authored Mar 27, 2022
```
Entity tests repaired

See merge request !10
```
  3f3a6c24
- Entity tests repaired · 46c30edf
  Jakub Balga authored Mar 27, 2022
  
  46c30edf
- Merge branch 'feature/entity-dao-tests/pavlica' into 'main' · 8191dc45
  Ondřej Pavlica authored Mar 27, 2022
```
Add tests skeleton, add User and ProductReview entity tests, add base DAO test...

See merge request !8
```
  8191dc45
- Merge branch 'feature/entity-dao/pavlica' into 'main' · 3f4e56ce
  Ondřej Pavlica authored Mar 27, 2022
```
Add javadoc comments

See merge request !7
```
  3f4e56ce
- Add tests skeleton, add User and ProductReview entity tests, add base DAO test... · 88396dad
  Ondřej Pavlica authored Mar 27, 2022
```
Add tests skeleton, add User and ProductReview entity tests, add base DAO test class, add User dao tests, add artificial UUID to all entities
```
  88396dad
26 Mar, 2022 7 commits
- Add javadoc comments · c4aa333d
  Ondřej Pavlica authored Mar 26, 2022
  
  c4aa333d
- Merge branch 'feature/balga/m1-repair' into 'main' · ec49bb56
  Ondřej Pavlica authored Mar 26, 2022
```
Feature/balga/m1 repair

See merge request !4
```
  ec49bb56
- Merge branch 'feature/entity-dao/dudik' into 'main' · d3aef386
  Ondřej Pavlica authored Mar 26, 2022
```
Add entity and DAO for User and ProductReview

See merge request !5
```
  d3aef386
- Merge branch 'update-gitignore' into 'main' · 4adaf07c
  Ondřej Pavlica authored Mar 26, 2022
```
Update .gitignore to ignore logs and .idea folder

See merge request !6
```
  4adaf07c
- Merge changes from main · 88c60b05
  Samuel Dudík authored Mar 26, 2022
  
  88c60b05
- Add entity and DAO for User and ProductReview · 2a27f25c
  Samuel Dudík authored Mar 26, 2022
  
  2a27f25c
- Attribute names changed · c587d6e7
  Jakub Balga authored Mar 26, 2022
  
  c587d6e7
25 Mar, 2022 3 commits
- Updated name of year field, lazy loading · 0ccd8a08
  Jakub Balga authored Mar 25, 2022
  
  0ccd8a08
- Merge branch 'korenkova' into 'main' · 8eab4d35
  Ondřej Pavlica authored Mar 25, 2022
```
added Order, OrderItem, WineBottle

See merge request !3
```
  8eab4d35
- edit equals in order, changed name of order table · 0f3d2dbe
  Michaela Korenková authored Mar 25, 2022
  
  0f3d2dbe