Commits · 69e03461e63cb71295989f759a0b4dcba649c8b0 · Diana Gulčíková / PA165 Formula One Team

Apr 08, 2023

Checkstyle fix · 69e03461
Tomáš Marek authored Apr 08, 2023

69e03461
Final version - merged with others · 487deb1e
Tomáš Marek authored Apr 08, 2023

487deb1e

Merge remote-tracking branch 'origin/13_fixes_oto' into 13_fixes_by_tomas · bc69d726

Tomáš Marek authored Apr 08, 2023

# Conflicts:
#	common_library/src/main/java/cz/muni/pa165/common_library/racecomponents/Car.java
#	common_library/src/main/java/cz/muni/pa165/common_library/racecomponents/CarComponent.java
#	common_library/src/main/java/cz/muni/pa165/common_library/racecomponents/Driver.java

bc69d726

Merge branch 'milestone_2' into 13_fixes_by_tomas · 619c0933

Tomáš Marek authored Apr 08, 2023

# Conflicts:
#	car/src/main/java/cz/muni/pa165/car/data/repository/CarRepository.java
#	car/src/test/java/cz/muni/pa165/car/rest/DriverManagerControllerItTest.java
#	car/src/test/java/cz/muni/pa165/car/rest/DriverManagerControllerUnitTest.java
#	common_library/src/main/java/cz/muni/pa165/common_library/racecomponents/Car.java
#	common_library/src/main/java/cz/muni/pa165/common_library/racecomponents/CarComponent.java
#	common_library/src/main/java/cz/muni/pa165/common_library/racecomponents/Driver.java

619c0933

Merge branch '13_fixes_by_andrej' into 'milestone_2' · fff9d171
Diana Gulčíková authored Apr 08, 2023
```
13 fixes by andrej

See merge request !25
```
fff9d171
Test switched off · 05fc9e12
Andrej Šimurka authored Apr 08, 2023

05fc9e12
Solved database persistance · 4abf8ad0
Andrej Šimurka authored Apr 08, 2023

4abf8ad0
Minor changes to models, added new controller functionality · 939fce0f
Andrej Šimurka authored Apr 08, 2023

939fce0f

Apr 07, 2023
- Finished driver module logic, Updated Car and Driver models · c5bfc4ad
  Andrej Šimurka authored Apr 07, 2023
  
  c5bfc4ad
- All Car CRUD operations working · 0485fef3
  Tomáš Marek authored Apr 07, 2023
  
  0485fef3
- Car-CarComponent management · 17009733
  Tomáš Marek authored Apr 07, 2023
  
  17009733
- Checkstyle fixes · 1501a55b
  Oto Stanko authored Apr 07, 2023
  
  1501a55b
- Static converters + car-driver assigning · 59455577
  Tomáš Marek authored Apr 07, 2023
  
  59455577
- Desperate attempt to fix the merge order · 3cb34f31
  Oto Stanko authored Apr 07, 2023
  
  3cb34f31
- Missing javadoc, needs sth more sensefull, also this way there will be just merges... · 1b162c92
  Oto Stanko authored Apr 07, 2023
  
  1b162c92
- Merge branch '13_fixes_by_andrej' into 13_fixes_oto · e6b44d5f
  Oto Stanko authored Apr 07, 2023
  
  e6b44d5f
- Merge branch '13_fixes_by_diana' into 13_fixes_oto · a8f14cb7
  Oto Stanko authored Apr 07, 2023
  
  a8f14cb7
- Merge branch '13_fixes_by_tomas' into 13_fixes_oto · a2e85324
  Oto Stanko authored Apr 07, 2023
  
  a2e85324
- Merge branch '13_fixes_by_andrej' of... · 1c81150b
  Oto Stanko authored Apr 07, 2023
```
Merge branch '13_fixes_by_andrej' of https://gitlab.fi.muni.cz/xgulcik/pa165-formula-one-team into 13_fixes_by_andrej
```
  1c81150b
- Merge branch '13_fixes_by_andrej' into 13_fixes_oto · 6d10d031
  Oto Stanko authored Apr 07, 2023
  
  6d10d031
- Checkstyle fix · ff9ba17a
  Tomáš Marek authored Apr 07, 2023
  
  ff9ba17a
- removed unnecesarry code · c87da0ea
  Oto Stanko authored Apr 07, 2023
  
  c87da0ea
Apr 06, 2023
- Finished driver logic · 26a0de8c
  Andrej Šimurka authored Apr 06, 2023
  
  26a0de8c
- small api fixes · 91ea4192
  Diana Gulčíková authored Apr 06, 2023
  
  91ea4192
- Commit before merging other branches · 5e08f5ac
  Oto Stanko authored Apr 06, 2023
  
  5e08f5ac
- Merge branch '13_fixes_by_tomas' into 13_fixes_oto · 3c18f926
  Oto Stanko authored Apr 06, 2023
  
  3c18f926
- CarComponent service and repo rework · 5c2cea01
  Oto Stanko authored Apr 06, 2023
  
  5c2cea01
- CarComponent controller · c813fb42
  Oto Stanko authored Apr 06, 2023
  
  c813fb42
- Merge branch '13_fixes_by_andrej' into 13_fixes_oto · 194f1e0e
  Oto Stanko authored Apr 06, 2023
  
  194f1e0e
- Merge branch '13_fixes_by_diana' into 13_fixes_oto · 8e9b1ec6
  Oto Stanko authored Apr 06, 2023
  
  8e9b1ec6
- Working CRUD operations, Car attributes are not annotated with @NotNull · 8bc9ebf3
  Tomáš Marek authored Apr 06, 2023
  
  8bc9ebf3
- A lot of changes to make it runable, CRUD operations do not work · 87345fbf
  Tomáš Marek authored Apr 06, 2023
  
  87345fbf
- exception handler + custom error class · e4544eb8
  Diana Gulčíková authored Apr 06, 2023
  
  e4544eb8
Apr 05, 2023
- fixing converting mistakes + mistakes in controllers, race api ok for GET POST DELET · 9e8a58a4
  Diana Gulčíková authored Apr 05, 2023
  
  9e8a58a4
- updated queries for updates · 6c2bc457
  Diana Gulčíková authored Apr 05, 2023
  
  6c2bc457
Apr 04, 2023
- Added docstrings · d63dadcf
  Oto Stanko authored Apr 04, 2023
  
  d63dadcf
- CarComponent made not abstract · 4415da71
  Oto Stanko authored Apr 04, 2023
  
  4415da71
- Added layers for drivers · bdc0709b
  Andrej Šimurka authored Apr 04, 2023
  
  bdc0709b
- Update of CarComponent service · 32ddec49
  Oto Stanko authored Apr 04, 2023
  
  32ddec49
- Merge branch '13_fixes_by_diana' into 13_fixes_oto · 10a4361e
  Oto Stanko authored Apr 04, 2023
  
  10a4361e