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

May 06, 2023
- Merge branch 'milestone3/runnable-scenario' into 'milestone-3' · f22539b8
  Marek Skácelík authored May 06, 2023
  f22539b8
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
- feat: tests, default user role 24/04/23 · 29ef4048
  Filip Bugoš authored Apr 24, 2023
  
  29ef4048
- feat: deletions + tests 20/04/23 · ff391399
  Filip Bugoš authored Apr 20, 2023
  
  ff391399
Apr 23, 2023
- Merge branch 'Metrics-User-update' into 'milestone-3' · 7227d24d
  Marek Skácelík authored Apr 23, 2023
  7227d24d
- added common dependencies to root pom and actuator and prometheus dependency · fda1443d
  Anesa Fazlagić authored Apr 23, 2023
  
  fda1443d
- Updated method to generate statistics · 76213be1
  Miroslav Rouča authored Apr 23, 2023
  
  76213be1
- Reformat User code · 45b3d5e6
  Miroslav Rouča authored Apr 23, 2023
  
  45b3d5e6
- Changed LocalDateTime to Instant for generating UserStatistics · b21ee156
  Miroslav Rouča authored Apr 23, 2023
  
  b21ee156
- Merge branch 'updateSmartMeter' into 'milestone-3' · d9728a86
  Marek Skácelík authored Apr 23, 2023
  d9728a86
- Merge branch 'milestone-3' into 'updateSmartMeter' · 3da52c5e
  Marek Skácelík authored Apr 23, 2023
  3da52c5e
- Merge branch 'milestone3/fixingissues' into 'milestone-3' · 06094e60
  Marek Skácelík authored Apr 23, 2023
  06094e60
- Deleted timestamp from Matrics · 0af78709
  Miroslav Rouča authored Apr 23, 2023
  
  0af78709
Apr 22, 2023
- Issue finished: Change of findAll methods in controllers · 578d774b
  Anesa Fazlagić authored Apr 22, 2023
  
  578d774b
Apr 21, 2023
- Merge branch 'update-ElectricityTarif' into 'milestone-3' · 248e5bd2
  Marek Skácelík authored Apr 21, 2023
  248e5bd2
- Updated companyId in electricityPrice · e9f5ccba
  Miroslav Rouča authored Apr 21, 2023 and Marek Skácelík committed Apr 21, 2023
  
  e9f5ccba
- Updated scheduled method · 5558bb57
  Miroslav Rouča authored Apr 21, 2023
  
  5558bb57
- Added active and scheduled method to SmartMeter · 27ae9b71
  Miroslav Rouča authored Apr 21, 2023
  
  27ae9b71
Apr 20, 2023
- Updated companyId in electricityPrice · bc5ec7f8
  Miroslav Rouča authored Apr 20, 2023
  
  bc5ec7f8
Apr 18, 2023
- Merge branch 'issue-34' into 'milestone-3' · 026dadbc
  Marek Skácelík authored Apr 18, 2023
  026dadbc