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

May 28, 2023
- Merge branch 'milestone-3' into 'main' · fa695932
  Marek Skácelík authored May 28, 2023
```
Final merge to main

See merge request !79
```
  fa695932
- Merge branch 'openApi-properties-fixes' into 'milestone-3' · d5475156
  Marek Skácelík authored May 28, 2023
```
Open api and properties fixes

See merge request !78
```
  d5475156
- Edited properties files · 14e72d83
  Miroslav Rouča authored May 28, 2023
  
  14e72d83
- Edited openApi, properties files, fixed docker for oauth · 7f5ba085
  Miroslav Rouča authored May 28, 2023
  
  7f5ba085
- Merge branch 'origin/test-missing-create-statistics' into 'milestone-3' · 4d821830
  Marek Skácelík authored May 28, 2023
```
added missing test in statistics for create method

See merge request !77
```
  4d821830
- Merge branch 'origin/readding-Grafana' into 'milestone-3' · 216766bd
  Marek Skácelík authored May 28, 2023
```
readded grafana dashboard

See merge request !76
```
  216766bd
- added missing test in statistics for create method · 061ec833
  Anesa Fazlagić authored May 28, 2023
  
  061ec833
- readded grafana dashboard · dac7978a
  Anesa Fazlagić authored May 28, 2023
  
  dac7978a
- Merge branch 'metrics-controller-tests' into 'milestone-3' · c1c368b6
  Marek Skácelík authored May 28, 2023
```
added some metrics tests

See merge request !75
```
  c1c368b6
- added some metrics tests · 11379cdf
  Marek Skácelík authored May 28, 2023
  
  11379cdf
- Merge branch 'smartmeter-controller-tests' into 'milestone-3' · 2a29efec
  Marek Skácelík authored May 28, 2023
```
added test for smartmeter

See merge request !74
```
  2a29efec
- added test for smartmeter · 9214e3c3
  Marek Skácelík authored May 28, 2023
  
  9214e3c3
- Merge branch 'datainit-fix' into 'milestone-3' · 22c4b78c
  Marek Skácelík authored May 28, 2023
```
fixed data init in yml

See merge request !73
```
  22c4b78c
- fixed data init in yml · 23a274f7
  Marek Skácelík authored May 28, 2023
  
  23a274f7
May 07, 2023
- Merge branch 'findCustomers-Employees-Houses' into 'milestone-3' · 17d70247
  Marek Skácelík authored May 07, 2023
```
Find customers employees houses

See merge request !72
```
  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
```
Feature/seeder

Closes #48

See merge request !71
```
  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
```
# Conflicts:
#   core/src/main/java/cz/muni/fi/pa165/core/DataInitializer.java
#   core/src/main/java/cz/muni/fi/pa165/core/user/roles/Role.java
```
  24bd3fcb
- Merge branch 'OAuth_v2' into 'milestone-3' · b12c047e
  Filip Bugoš authored May 07, 2023
```
feat: OAuth 07/05/23

See merge request !70
```
  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
```
Add scheduled method to email

See merge request !68
```
  99f9b4bd
May 06, 2023
- Merge branch 'milestone3/runnable-scenario' into 'milestone-3' · f22539b8
  Marek Skácelík authored May 06, 2023
```
added script for testing with locust and the report result in csv

See merge request !67
```
  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
```
Prometheus which tracks all microservices and grafana for visual presentation of the statistics & electricity database fix.

See merge request !65
```
  f3388eaa
- Merge branch 'fix/electricy-price-db-tests' into 'milestone3/metrics' · 42f1d6b8
  Marek Skácelík authored May 03, 2023
```
added inmemory db for tests in electricy

See merge request !66
```
  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