Commit graph

322 commits

Author SHA1 Message Date
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
c6d5a1acd7 controllers fixed and updated for guest or host checks 2020-04-22 17:17:07 +02:00
omenem
5c2f828834 wid, added implements keyword for Boolean/RangeTriggerable in all the devices 2020-04-22 16:48:49 +02:00
a428d57fe1 WIP: controllers check for owner or guest, device service needs review 2020-04-22 15:30:23 +02:00
db21aa0a26 Code review 2020-04-21 17:36:17 +02:00
c4f295d7d9 refactored controllers code 2020-04-21 17:09:11 +02:00
Claudio Maggioni (maggicl)
4357606187 Code review 2020-04-21 16:58:12 +02:00
omenem
618c152466 wip 2020-04-21 15:21:47 +02:00
Claudio Maggioni (maggicl)
eef0887da1 Code review 2020-04-21 14:57:11 +02:00
omenem
0692f7e2ee wip 2020-04-21 14:45:04 +02:00
Claudio Maggioni (maggicl)
6317ac99e4 Code review 2020-04-21 14:25:42 +02:00
Claudio Maggioni (maggicl)
cfe3848d7e Done method to get dimmable light if owner or guest 2020-04-21 14:06:56 +02:00
db102f75e4 light and room controller routes check for guest authorization 2020-04-20 16:41:11 +02:00
Claudio Maggioni (maggicl)
319629a681 Pseudocode for automation implemmentation 2020-04-20 14:14:04 +02:00
omenem
5c0df55de9 wip 2020-04-20 13:47:27 +02:00
7b80b52f9e guest controller should be finished, must be reviewed 2020-04-19 17:10:42 +02:00
36a7a649d5 started guest controllers (WIP) 2020-04-18 17:35:14 +02:00
566a2e72e3 invited model finally works 2020-04-18 15:35:04 +02:00
262dbf12e7 hopefully fixed invited relationship II: The Revenge 2020-04-18 14:52:11 +02:00
d2aaa45a8b hopefully fixed invited relationship 2020-04-18 14:11:21 +02:00
6e36d7d306 updated onetomany relationship 2020-04-18 12:43:01 +02:00
3921fe1330 started invitation relationship 2020-04-18 12:43:01 +02:00
Claudio Maggioni (maggicl)
61ff797ea1 Fixes to Scene implementation 2020-04-18 12:38:52 +02:00
omenem
e79ab46cb8 added sceneBinding method in cotrollers of output devices 2020-04-18 10:54:53 +02:00
Claudio Maggioni (maggicl)
f565a3be6e Added documentation to Device.cloneState() 2020-04-17 21:12:33 +02:00
Claudio Maggioni (maggicl)
4aa4d68738 Fix on thermostat 2020-04-17 21:05:17 +02:00
Claudio Maggioni (maggicl)
57a6e22e2a Corrections on Scene controllers and method cloneState on all OutputDevices 2020-04-17 20:54:09 +02:00
Claudio Maggioni (maggicl)
2bfff689b3 Simplified Models for States 2020-04-17 20:22:28 +02:00
Claudio Maggioni (maggicl)
7bb4cd34e1 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into 53-users-can-create-scenes 2020-04-17 19:19:46 +02:00