Commits · 17d70247f4894a098fd60c0d4a28746b67bf1a31 · Marek Skácelík / Smart Energy Management System · GitLab

May 07, 2023
- Merge branch 'findCustomers-Employees-Houses' into 'milestone-3' · 17d70247
  Marek Skácelík authored May 07, 2023
  17d70247
- Fixed pom.xml · 03f64a63
  Miroslav Rouča authored May 07, 2023
  
  03f64a63
- Added findAllCustomers, findAllEmployees, findHousesByUserId · 5e2cf063
  Miroslav Rouča authored May 07, 2023
  
  5e2cf063
- Merge branch 'feature/seeder' into 'milestone-3' · 582080ba
  Marek Skácelík authored May 07, 2023
  582080ba
- Added some instruction in README.md for seeding/clearing data · ca65449e
  Marek Skácelík authored May 07, 2023
  
  ca65449e
- Merge branch 'milestone-3' into 'feature/seeder' · 24bd3fcb
  Marek Skácelík authored May 07, 2023
  24bd3fcb
- Merge branch 'OAuth_v2' into 'milestone-3' · b12c047e
  Filip Bugoš authored May 07, 2023
  b12c047e
- feat: OAuth 07/05/23 · 3e9ae9cc
  Filip Bugoš authored May 04, 2023
  
  3e9ae9cc
- Added data initializer + data clearer · 40866e0e
  Marek Skácelík authored May 06, 2023
  
  40866e0e
- Merge branch 'addScheduledEmail' into 'milestone-3' · 99f9b4bd
  Marek Skácelík authored May 07, 2023
  99f9b4bd
May 06, 2023
- Merge branch 'milestone3/runnable-scenario' into 'milestone-3' · f22539b8
  Marek Skácelík authored May 06, 2023
  f22539b8
- Added RepositoryTest to ElectricityPrice · 78fb7d37
  Miroslav Rouča authored May 06, 2023
  
  78fb7d37
- Deleted h2 dependency from pom · 78e62b1a
  Miroslav Rouča authored May 06, 2023
  
  78e62b1a
- Added Scheduled method to EmailService, some fixes for EmailMicroservice · c6440618
  Miroslav Rouča authored May 02, 2023
  
  c6440618
- added prometheus for the microservices in docker · 5a26bf8a
  Anesa Fazlagić authored Apr 30, 2023 and Miroslav Rouča committed May 06, 2023
  
  5a26bf8a
- added prometheus for the microservices in docker · baa08e47
  Anesa Fazlagić authored Apr 30, 2023 and Miroslav Rouča committed May 06, 2023
  
  baa08e47
- Fixed M2 review and updated Class diagram · b7c243d0
  Miroslav Rouča authored May 04, 2023
  
  b7c243d0
- Added findAllCustomers and findHousesById · 11e47e4e
  Miroslav Rouča authored May 06, 2023
  
  11e47e4e
- Resolved conflict · 0a78895f
  Miroslav Rouča authored May 02, 2023
  
  0a78895f
May 05, 2023
- added locust description · 99b8d380
  Anesa Fazlagić authored May 05, 2023
  
  99b8d380
- added script for testing with locust and the report result in csv · c692b9f6
  Anesa Fazlagić authored May 05, 2023
  
  c692b9f6
May 03, 2023
- Merge branch 'milestone3/metrics' into 'milestone-3' · f3388eaa
  Marek Skácelík authored May 03, 2023
  f3388eaa
- Merge branch 'fix/electricy-price-db-tests' into 'milestone3/metrics' · 42f1d6b8
  Marek Skácelík authored May 03, 2023
  42f1d6b8
- added inmemory db for tests in electricy · b4781dd5
  Marek Skácelík authored May 03, 2023
  
  b4781dd5
May 02, 2023
- Added Prometheus & Grafana usage directions. · a3d9a2f8
  Anesa Fazlagić authored May 02, 2023
  
  a3d9a2f8
May 01, 2023
- deleted unneeded prometheus.yml files in microservices · c494cb47
  Anesa Fazlagić authored May 01, 2023
  
  c494cb47
- some changes to the db · 4e88d541
  Anesa Fazlagić authored May 01, 2023
  
  4e88d541
- added one unique prometheus which tracks all microservices and added grafana... · 1c296775
  Anesa Fazlagić authored May 01, 2023
  1c296775
- changed docker of electricity microservice to use postgres properly · 04054882
  Anesa Fazlagić authored May 01, 2023
  
  04054882
Apr 30, 2023
- added prometheus for the microservices in docker · c7be5d5a
  Anesa Fazlagić authored Apr 30, 2023
  
  c7be5d5a
Apr 27, 2023
- Merge branch 'milestone3/refactoring' into 'milestone-3' · 582f73b5
  Marek Skácelík authored Apr 27, 2023
  582f73b5
- Merge branch 'DeviceAndCompanyControllerTests' into 'milestone-3' · 58dcd566
  Marek Skácelík authored Apr 27, 2023
  58dcd566
- Merge branch 'milestone-3' into 'DeviceAndCompanyControllerTests' · 779692ce
  Marek Skácelík authored Apr 27, 2023
  779692ce
- Merge branch 'RepositoryTestsUpdate' into 'milestone-3' · 313dc34a
  Marek Skácelík authored Apr 27, 2023
  313dc34a
- Update Repository tests · d959d11f
  Miroslav Rouča authored Apr 27, 2023 and Marek Skácelík committed Apr 27, 2023
  
  d959d11f
Apr 25, 2023
- Added DeviceController tests, updated DeviceController and some fixes in CompanyControllerTest · 0d4550b6
  Miroslav Rouča authored Apr 25, 2023
  
  0d4550b6
- Added CompanyController testy, updated some CompanyController methods (HttpStatus) · 4bbb42cd
  Miroslav Rouča authored Apr 24, 2023
  
  4bbb42cd
- Update Repository tests in core, merge application.yml, disable Datainitializer in tests · 6fe6f281
  Miroslav Rouča authored Apr 24, 2023
  
  6fe6f281
Apr 24, 2023
- Merge branch 'deleting_entities_v5' into 'milestone-3' · 03127319
  Filip Bugoš authored Apr 24, 2023
  03127319
- merge fix · 738976a9
  Filip Bugoš authored Apr 24, 2023
  
  738976a9