Jacob Salvi
|
0151467b2e
|
Merge branch 'dev' into '75-backend-unit-testing'
# Conflicts:
# src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java
|
2020-05-17 15:28:14 +02:00 |
|
Jacob Salvi
|
00452d5295
|
made a couple of tests
|
2020-05-17 15:20:14 +02:00 |
|
Claudio Maggioni (maggicl)
|
eeec726966
|
Tests on Utils and UserResponse
|
2020-05-17 13:56:54 +02:00 |
|
Claudio Maggioni (maggicl)
|
4e35aa4a75
|
Tests on exception classes
|
2020-05-17 13:26:51 +02:00 |
|
|
|
7b606307df
|
Merge branch '75-backend-unit-testing-tommaso' into 'dev'
Resolve "backend-unit-testing"
Closes #75
See merge request sa4-2020/the-sanmarinoes/backend!143
|
2020-05-17 12:52:37 +02:00 |
|
Claudio Maggioni (maggicl)
|
bc7b30f3ea
|
Fixed lombok in AutomationFastUpdateRequest
|
2020-05-17 12:49:40 +02:00 |
|
|
|
fdef45b8c2
|
Merge branch '75-backend-unit-testing' into 'dev'
Resolve "backend-unit-testing"
Closes #75
See merge request sa4-2020/the-sanmarinoes/backend!142
|
2020-05-17 12:34:58 +02:00 |
|
omenem
|
c5b3a57faa
|
fix
|
2020-05-17 11:52:37 +02:00 |
|
omenem
|
940c072711
|
fix
|
2020-05-17 11:33:30 +02:00 |
|
omenem
|
0ce6e84380
|
fix
|
2020-05-17 11:26:49 +02:00 |
|
omenem
|
dd1d59a095
|
fix
|
2020-05-17 11:13:50 +02:00 |
|
omenem
|
198be1f668
|
more tests
|
2020-05-17 10:16:12 +02:00 |
|
omenem
|
3f568c77d3
|
more tests
|
2020-05-16 18:00:28 +02:00 |
|
omenem
|
7020f0d692
|
fix
|
2020-05-15 19:01:28 +02:00 |
|
omenem
|
3d9ddb5ffd
|
some tests
|
2020-05-15 18:52:57 +02:00 |
|
|
|
3dcfa584f0
|
made some fields private
|
2020-05-14 21:02:49 +02:00 |
|
|
|
368530de97
|
automation dto should be tested
|
2020-05-14 19:00:07 +02:00 |
|
Claudio Maggioni (maggicl)
|
3ed6102b9f
|
Added example tests for SensorController
|
2020-05-13 12:10:06 +02:00 |
|
Jacob Salvi
|
b4bf15583a
|
a couple of tests
|
2020-05-13 09:42:36 +02:00 |
|
|
|
acec5a0af8
|
Degenerified states
|
2020-05-12 18:32:23 +02:00 |
|
|
|
6223434979
|
Removed duplication
|
2020-05-12 17:20:19 +02:00 |
|
|
|
0d10d759a6
|
Removed @NotNull from models
|
2020-05-12 17:14:25 +02:00 |
|
|
|
582f44581b
|
More lombok-ification
|
2020-05-12 16:59:46 +02:00 |
|
|
|
3bb008517a
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into sonar-fix
|
2020-05-12 15:46:23 +02:00 |
|
|
|
87df96760d
|
Added lombok and converted DTOs
|
2020-05-12 15:44:32 +02:00 |
|
Jacob Salvi
|
c614f96b31
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-05-10 21:54:18 +02:00 |
|
Claudio Maggioni (maggicl)
|
c6041e0e0f
|
Degenerified Conditions
|
2020-05-10 21:44:10 +02:00 |
|
|
|
c003bd1e87
|
Merge branch '55-users-can-add-conditions-to-automations' into 'dev'
Resolve "Users can add conditions to automations"
Closes #55
See merge request sa4-2020/the-sanmarinoes/backend!133
|
2020-05-10 21:30:39 +02:00 |
|
Claudio Maggioni (maggicl)
|
0ba0d10cdc
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into 55-users-can-add-conditions-to-automations
|
2020-05-10 21:26:42 +02:00 |
|
Claudio Maggioni (maggicl)
|
5e1b07d32f
|
Even another batch of sonar fixes
|
2020-05-10 20:47:18 +02:00 |
|
Jacob Salvi
|
1b22534f40
|
room and thermostat tests
|
2020-05-10 15:17:27 +02:00 |
|
Claudio Maggioni (maggicl)
|
573a5c6a91
|
Fixing confirmationTokenRepository and deleted generic parameter on children of trigger
|
2020-05-10 12:48:41 +02:00 |
|
Claudio Maggioni (maggicl)
|
b64979500b
|
Even another batch of sonar fixes
|
2020-05-10 12:39:18 +02:00 |
|
Claudio Maggioni (maggicl)
|
9394a8439f
|
Even another batch of sonar fixes
|
2020-05-10 12:09:53 +02:00 |
|
Claudio Maggioni (maggicl)
|
483a42b1e0
|
Even another batch of sonar fixes
|
2020-05-10 00:38:13 +02:00 |
|
|
|
5d4aea2e56
|
Sonarqube fixes to tests
|
2020-05-09 19:16:23 +02:00 |
|
|
|
bd47a571d5
|
Sonarqube fixes
|
2020-05-09 17:53:58 +02:00 |
|
|
|
b4ded92695
|
Sonarqube fixes
|
2020-05-09 17:44:38 +02:00 |
|
omenem
|
a24b30ce19
|
fix in automation repo
|
2020-05-09 16:55:47 +02:00 |
|
Claudio Maggioni (maggicl)
|
15faf0a6b4
|
Fixed circular dependency on switch connector
|
2020-05-09 14:23:39 +02:00 |
|
Claudio Maggioni (maggicl)
|
191870d3c6
|
More sonarqube fixes
|
2020-05-09 14:05:43 +02:00 |
|
Claudio Maggioni (maggicl)
|
6e98972a5b
|
Minor code style fixes and global formatter run
|
2020-05-09 13:42:17 +02:00 |
|
Claudio Maggioni (maggicl)
|
204f7bf423
|
Even more Sonarqube fixes
|
2020-05-09 13:29:03 +02:00 |
|
Claudio Maggioni (maggicl)
|
ba02475c83
|
Fixed very severe security vulnerability (Use logger instead of System.out in SensorSocketEndpoint)
|
2020-05-09 13:18:33 +02:00 |
|
Claudio Maggioni (maggicl)
|
bd32a2aebb
|
more Sonarqube fixes
|
2020-05-09 13:13:31 +02:00 |
|
Claudio Maggioni (maggicl)
|
a61e43a014
|
Sonarqube fixes
|
2020-05-08 23:18:18 +02:00 |
|
omenem
|
628edfd76f
|
edited GSONConfig
|
2020-05-08 17:50:59 +02:00 |
|
omenem
|
b72f527b0d
|
Added conditions in PUT automation/fast
|
2020-05-08 17:44:30 +02:00 |
|
britea
|
501b9219b9
|
resolve conflict
|
2020-05-08 10:03:31 +02:00 |
|
britea
|
c9f53f0c97
|
fix thermostat
|
2020-05-08 09:59:42 +02:00 |
|
omenem
|
09c08580ca
|
Everything should be implemented
|
2020-05-07 19:01:35 +02:00 |
|
omenem
|
1bde4344be
|
Added controllers repos and dtos
|
2020-05-07 18:12:55 +02:00 |
|
omenem
|
1f5f948e23
|
wip
|
2020-05-07 16:38:45 +02:00 |
|
Claudio Maggioni (maggicl)
|
c8ebd8f917
|
WIP on error fixing for sonarqube code smells and vulnerabilities check
|
2020-05-07 10:33:20 +02:00 |
|
omenem
|
74364effe6
|
wip
|
2020-05-07 10:04:05 +02:00 |
|
omenem
|
6060e627dd
|
wip
|
2020-05-07 10:01:51 +02:00 |
|
|
|
ddcdaccbe0
|
Check Scene.guestAccessEnabled flag on guest application of scene
|
2020-05-05 16:31:54 +02:00 |
|
Claudio Maggioni (maggicl)
|
a278a9f7b3
|
Reviewed GET /scene?hostId= and GET /scene/{sceneId}/apply?hostId=
|
2020-05-04 17:11:59 +02:00 |
|
Claudio Maggioni (maggicl)
|
c24598cc6a
|
Done security camera filtering if required by host
|
2020-05-04 16:35:46 +02:00 |
|
Claudio Maggioni (maggicl)
|
16d1af2b36
|
Scene copy implemented
|
2020-05-04 16:10:17 +02:00 |
|
Claudio Maggioni (maggicl)
|
5bfce7e99b
|
Added icons to scenes
|
2020-05-04 15:09:11 +02:00 |
|
Claudio Maggioni (maggicl)
|
21bc66d24b
|
Deletion propagation implemented
|
2020-05-04 11:58:03 +02:00 |
|
Claudio Maggioni (maggicl)
|
69d1b38ff2
|
other minor fixes^2
|
2020-05-03 19:50:00 +02:00 |
|
Claudio Maggioni (maggicl)
|
4a963115bb
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into guests-fix
|
2020-05-03 16:38:27 +02:00 |
|
Claudio Maggioni (maggicl)
|
aad6cc52ce
|
Fixed thermostat socket updates
|
2020-05-03 14:14:24 +02:00 |
|
Claudio Maggioni (maggicl)
|
25eb9555c0
|
Fixed for frontend to guest controllers
|
2020-05-02 22:37:54 +02:00 |
|
|
|
6263bd2d35
|
WIP
|
2020-05-02 20:50:50 +02:00 |
|
Claudio Maggioni (maggicl)
|
92e93c80e8
|
WIP
|
2020-05-02 16:41:11 +02:00 |
|
Claudio Maggioni (maggicl)
|
7ae7522359
|
Fixed propagation of device updates on automation scene application
|
2020-05-02 14:53:12 +02:00 |
|
Claudio Maggioni (maggicl)
|
c3d6590507
|
Thermostats fixed (for scenes)
|
2020-05-02 13:58:28 +02:00 |
|
Claudio Maggioni (maggicl)
|
e0ab831be9
|
Thermostats fixed
|
2020-05-02 11:12:11 +02:00 |
|
Claudio Maggioni (maggicl)
|
3d74e02434
|
Fixed GSON serializations of triggers
|
2020-05-01 20:04:44 +02:00 |
|
Claudio Maggioni (maggicl)
|
cfa2f794cb
|
fix
|
2020-04-28 10:48:09 +02:00 |
|
Claudio Maggioni (maggicl)
|
ba73348a74
|
fixz
|
2020-04-28 10:05:08 +02:00 |
|
omenem
|
5fc63edf4f
|
fix
|
2020-04-27 19:04:52 +02:00 |
|
omenem
|
cf06950b62
|
fix
|
2020-04-27 18:59:01 +02:00 |
|
|
|
eacc77fa43
|
fix
|
2020-04-27 18:51:55 +02:00 |
|
Christian Capeáns Pérez
|
c1147f02ae
|
fixed some stuff not working on automations
|
2020-04-27 17:03:17 +02:00 |
|
|
|
60c057ce5b
|
Merge branch 'socket-fix' into 'dev'
Socket fix
See merge request sa4-2020/the-sanmarinoes/backend!94
|
2020-04-27 14:30:11 +02:00 |
|
Claudio Maggioni (maggicl)
|
579dcaacfd
|
fix @SocketGsonExclude on device and children
|
2020-04-27 14:28:34 +02:00 |
|
omenem
|
719bde0840
|
fix
|
2020-04-27 13:55:59 +02:00 |
|
omenem
|
cc2a16f3e3
|
fix
|
2020-04-27 11:54:31 +02:00 |
|
omenem
|
06dbd2bef0
|
fix
|
2020-04-26 13:57:30 +02:00 |
|
omenem
|
c9395404e0
|
fix
|
2020-04-26 13:29:14 +02:00 |
|
omenem
|
10dc0c9741
|
new route fix
|
2020-04-26 12:13:46 +02:00 |
|
Claudio Maggioni (maggicl)
|
be7c9ce99f
|
fix duplicate device names
|
2020-04-25 22:51:30 +02:00 |
|
|
|
dbf9ef885b
|
Merge branch 'fix' into 'dev'
fix update sensor
See merge request sa4-2020/the-sanmarinoes/backend!86
|
2020-04-25 16:34:16 +02:00 |
|
Nicola Brunner
|
c5aab751df
|
fix update sensor
|
2020-04-25 16:33:00 +02:00 |
|
omenem
|
d61c7bbc0b
|
controller for triggers
|
2020-04-25 15:59:06 +02:00 |
|
omenem
|
db35205ed8
|
controller for scenePriority
|
2020-04-25 15:20:00 +02:00 |
|
omenem
|
5eadb2314c
|
wip
|
2020-04-25 15:00:22 +02:00 |
|
omenem
|
509d890c7e
|
Controllers for automation
|
2020-04-25 14:56:07 +02:00 |
|
britea
|
24804d2d82
|
fix scene repository
|
2020-04-24 23:09:31 +02:00 |
|
|
|
54c27921d9
|
Fixed DeviceService
|
2020-04-23 17:10:59 +02:00 |
|
Claudio Maggioni (maggicl)
|
3da04ccaef
|
Fixed user story 5 and 7
|
2020-04-23 11:17:46 +02:00 |
|
Claudio Maggioni (maggicl)
|
7ebf74a4c8
|
WIP merge with dev
|
2020-04-22 23:11:32 +02:00 |
|
Claudio Maggioni (maggicl)
|
37ea9591cf
|
Code review
|
2020-04-22 23:04:43 +02:00 |
|
Claudio Maggioni (maggicl)
|
3894fa14a9
|
Code review
|
2020-04-22 22:54:34 +02:00 |
|
|
|
389af7c04d
|
all device controllers have been updated with device service
|
2020-04-22 18:13:06 +02:00 |
|
omenem
|
570b1e8b29
|
wip, implemented very long stream in DeviceService, SceneService is missing though
|
2020-04-22 17:30:16 +02:00 |
|
