Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Smart Energy Management System
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

0be5ce05

There was an error fetching the commit references. Please try again later.

Commit 0be5ce05 authored 1 year ago by Marek Skácelík

Downloads
- Plain Diff

Merge branch 'company-test-create-fix' into 'milestone-2'

fix: unique seeder 08/04/23

See merge request !34

parents 3d2e9b89 26c4e15c

No related branches found

No related tags found

Loading

Pipeline #

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/java/cz/muni/fi/pa165/core/DataInitializer.java 3 additions, 3 deletions

.../src/main/java/cz/muni/fi/pa165/core/DataInitializer.java
core/src/main/java/cz/muni/fi/pa165/core/common/DomainFacade.java 8 additions, 1 deletion

.../main/java/cz/muni/fi/pa165/core/common/DomainFacade.java
core/src/main/java/cz/muni/fi/pa165/core/company/Company.java 5 additions, 6 deletions

.../src/main/java/cz/muni/fi/pa165/core/company/Company.java
core/src/main/java/cz/muni/fi/pa165/core/company/CompanyController.java 6 additions, 2 deletions

...java/cz/muni/fi/pa165/core/company/CompanyController.java
core/src/main/java/cz/muni/fi/pa165/core/device/Device.java 2 additions, 4 deletions

core/src/main/java/cz/muni/fi/pa165/core/device/Device.java
core/src/main/java/cz/muni/fi/pa165/core/manufacturer/Manufacturer.java 2 additions, 0 deletions

...java/cz/muni/fi/pa165/core/manufacturer/Manufacturer.java
core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeter.java 2 additions, 4 deletions

...ain/java/cz/muni/fi/pa165/core/smartmeter/SmartMeter.java
core/src/main/java/cz/muni/fi/pa165/core/user/User.java 2 additions, 5 deletions

core/src/main/java/cz/muni/fi/pa165/core/user/User.java
core/src/main/java/cz/muni/fi/pa165/core/user/UserController.java 12 additions, 6 deletions

.../main/java/cz/muni/fi/pa165/core/user/UserController.java
core/src/test/java/cz/muni/fi/pa165/core/company/CompanyControllerTest.java 61 additions, 0 deletions

.../cz/muni/fi/pa165/core/company/CompanyControllerTest.java

with 103 additions and 31 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment