b9221cecc6
fixed application.properties for tests
2020-03-25 20:21:54 +01:00
b283a62d0d
fixed redirects
2020-03-25 17:31:24 +01:00
334d35a4cc
Merge branch '49-fix-bug' into 'dev'
...
Fixed @tommi27 synchronization frenzy for sensors
Closes #49
See merge request sa4-2020/the-sanmarinoes/backend!61
2020-03-25 17:28:11 +01:00
britea
60c17b3dd8
Fixed @tommi27 synchronization frenzy for sensors
...
I have now discovered the Schadenfreude in using git-blame. To quote an
old commit message from high school:
[Trascrizione domande fisica e correzione di GRAVISSIMI bug presenti nel
codici di Maggioni](dd0933def0
2020-03-25 17:10:27 +01:00
Matteo Omenetti
03bbf6b824
Merge branch '47-fix-cascade-deletion-when-room-is-deleted' into 'dev'
...
Resolve "Fix cascade deletion when room is deleted"
Closes #47
See merge request sa4-2020/the-sanmarinoes/backend!59
2020-03-25 15:08:39 +01:00
5f26a94052
Merge branch '41-docker-how-to-for-app-usage' into 'dev'
...
Resolve "Docker how-to for app usage"
Closes #41
See merge request sa4-2020/the-sanmarinoes/backend!58
2020-03-25 15:06:44 +01:00
omenem
6ce44e73ff
fix min intensity of dimmabke light of 1 in Dimmable Save Request
2020-03-25 14:58:56 +01:00
4281cbaf29
Added installation instructions and tweaked Dockerfile
2020-03-25 14:57:46 +01:00
Matteo Omenetti
c8121d8473
Merge branch '45-solve-concurrency-issues-with-socket-updates-from-sensorsocket' into 'dev'
...
Resolve "Solve concurrency issues with socket updates from SensorSocket"
Closes #45
See merge request sa4-2020/the-sanmarinoes/backend!57
2020-03-25 14:53:44 +01:00
e776b9c2e5
socket is now sequential and not concurrent
2020-03-25 14:50:05 +01:00
omenem
9fc0224b1d
fix room deletion
2020-03-25 14:14:12 +01:00
Jacob Salvi
8179e0ff19
testing junit viewer 3
2020-03-24 17:09:45 +01:00
Jacob Salvi
9c471294ba
testing junit viewer 2
2020-03-24 17:04:11 +01:00
Matteo Omenetti
bcade19f52
Merge branch '44-delete-cascade-when-room-is-deleted' into 'dev'
...
delete cascade in room
Closes #44
See merge request sa4-2020/the-sanmarinoes/backend!56
2020-03-24 16:03:33 +01:00
omenem
08c4ef49a7
delete cascade in room
2020-03-24 15:58:01 +01:00
Jacob Salvi
1d491dc32e
testing junit viewer
2020-03-24 15:51:33 +01:00
Matteo Omenetti
bbfb9f8fcb
Merge branch '43-delete-cascade-in-switch' into 'dev'
...
delete cascade no more in switch
Closes #43
See merge request sa4-2020/the-sanmarinoes/backend!55
2020-03-23 18:35:11 +01:00
omenem
f368084464
delete cascade no more in switch
2020-03-23 18:31:46 +01:00
Matteo Omenetti
9ed2c66b54
Merge branch '40-on-delete-set-null-must-be-set-in-sql-schema' into 'dev'
...
delete cascade no more
Closes #40
See merge request sa4-2020/the-sanmarinoes/backend!54
2020-03-23 17:57:23 +01:00
omenem
c17b6df3b5
delete cascade no more
2020-03-23 17:53:22 +01:00
b9320ea078
Merge branch 'room-update-fix' into 'dev'
...
RoomController PUT fixed
See merge request sa4-2020/the-sanmarinoes/backend!53
2020-03-23 16:46:22 +01:00
f4d6a3f3c7
RoomController PUT fixed
2020-03-23 16:42:33 +01:00
Matteo Omenetti
1204451e47
Merge branch '42-fix-missing-id-in-roomsaverequest' into 'dev'
...
fix of missing id
Closes #42
See merge request sa4-2020/the-sanmarinoes/backend!52
2020-03-22 18:24:45 +01:00
omenem
8813942cc5
fixxed
2020-03-22 18:19:41 +01:00
1c8c4b61d9
Merge branch '39-kind-name-on-device-does-not-match-route-name' into 'dev'
...
fixed route names
Closes #39
See merge request sa4-2020/the-sanmarinoes/backend!51
2020-03-21 15:12:35 +01:00
600529af41
fixed route names
2020-03-21 15:08:36 +01:00
1fe0d674a2
Merge branch '38-get-room-id-devices-does-not-return-device-specific-data' into 'dev'
...
Resolve "Get /room/{id}/devices does not return device specific data"
Closes #38
See merge request sa4-2020/the-sanmarinoes/backend!49
2020-03-21 00:43:04 +01:00
c3bcfd7e6d
Fixed RoomCont... to return specific device data
...
@tommi27 why are you not avaliable at 1am?
2020-03-21 00:38:01 +01:00
cbfbb81c10
Merge branch '29-check-if-device-is-currently-user-s-own-device-when-updating' into 'dev'
...
controllers now check if devices belong to the correct user
Closes #29
See merge request sa4-2020/the-sanmarinoes/backend!46
2020-03-18 17:02:12 +01:00
4f9d8534ae
Merge branch '37-docker-container-image-name-is-the-same-as-frontend-and-thus-overwrites-their-image' into 'dev'
...
Resolve "Docker container image name is the same as frontend and thus overwrites their image"
Closes #37
See merge request sa4-2020/the-sanmarinoes/backend!48
2020-03-18 16:13:05 +01:00
f367d9ac59
Changed docker image name on CI deploy stage
2020-03-18 16:08:49 +01:00
3205dcf617
Merge branch '36-problems-when-executing-queries-on-rooms-due-to-lob-array' into 'dev'
...
Resolve "Problems when executing queries on rooms due to LOB array"
Closes #36
See merge request sa4-2020/the-sanmarinoes/backend!47
2020-03-18 13:38:03 +01:00
britea
e777f29585
Fix lob errors
2020-03-18 13:29:21 +01:00
Matteo Omenetti
300f749144
Merge branch '35-test-models' into 'dev'
...
Resolve "Test Models"
Closes #35
See merge request sa4-2020/the-sanmarinoes/backend!43
2020-03-18 12:15:14 +01:00
omenem
ce0edd7287
KnobDimmer Tests
2020-03-17 17:45:50 +01:00
Jacob Salvi
5e7bd298de
Added some tests for Regular Light and for Switch
2020-03-17 17:44:57 +01:00
35540fac80
controllers now check if devices belong to the correct user
2020-03-17 17:38:26 +01:00
7095de71a6
Merge branch '30-add-wattage-data-to-smart-plugs' into 'dev'
...
Resolve "Add wattage data to smart plugs"
Closes #30
See merge request sa4-2020/the-sanmarinoes/backend!42
2020-03-17 17:01:26 +01:00
835c9e0471
Fixed smaal errors @tommi27 implementation. Fixed precision and scale values or total precision. Optimized update by using JPQL
2020-03-17 16:54:35 +01:00
omenem
313e6ed88e
small changes
2020-03-17 15:20:49 +01:00
omenem
fe911d492f
small changes
2020-03-17 15:10:49 +01:00
omenem
207e80c5f9
Tests for DimmableLight
2020-03-17 14:34:17 +01:00
60927fff3b
Merge branch '33-one-line-correction' into 'dev'
...
Resolve "One line correction"
Closes #33
See merge request sa4-2020/the-sanmarinoes/backend!44
2020-03-17 14:22:01 +01:00
Jacob Salvi
21bf76027f
idk
2020-03-17 14:13:34 +01:00
omenem
25c077dd04
Tests for ButtonDimmer
2020-03-17 14:09:20 +01:00
Jacob Salvi
92b799e61c
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into ci-cd
2020-03-17 14:06:49 +01:00
3096c7862c
Merge branch '22-test-controllers' into 'dev'
...
Resolve "Test all new controllers and websocket"
Closes #31
See merge request sa4-2020/the-sanmarinoes/backend!39
2020-03-17 14:02:26 +01:00
Jacob Salvi
e8f90c832d
added tags: dind, also I am an idiot
2020-03-17 13:52:30 +01:00
2b65198df7
updated smartplug
2020-03-16 17:01:21 +01:00
9b9dac533d
Merge branch '34-drop-uniquess-constraint-on-user-fk-in-room-entity' into 'dev'
...
Resolve "Drop uniquess constraint on User FK in Room entity"
Closes #34
See merge request sa4-2020/the-sanmarinoes/backend!41
2020-03-16 15:12:13 +01:00
