Commit graph

136 commits

Author SHA1 Message Date
a8ad054a13 Merge branch 'master' into 'dev'
Master

See merge request sa4-2020/the-sanmarinoes/backend!75
2020-04-15 16:24:09 +02:00
Claudio Maggioni (maggicl)
68f9b352cd Updaed websocket to perform batch updates 2020-04-12 17:47:03 +02:00
Claudio Maggioni (maggicl)
8629c1f6b4 Adapted websocket code to new redux specification 2020-04-12 15:58:40 +02:00
britea
ad4a5a9c17 Added intensity to knob-dimmer 2020-04-11 18:30:47 +02:00
e46ac02da5 Input output connection routes now accept array of outputs 2020-04-11 17:24:23 +02:00
13db88b810 fix 2020-03-26 11:17:42 +01:00
802cee52f8 fixed cors on password reset 2020-03-26 01:01:49 +01:00
6c9e2a7d7d Fixed ConcurrentModificationException on socket broadcast 2020-03-25 23:13:17 +01:00
27cb73292c Added /auth/profile 2020-03-25 22:41:59 +01:00
c5996608a4 fixed dimmable light 2020-03-25 22:34:15 +01:00
3518647eeb Merge branch '48-redirection-to-frontend-after-email-confirmation-operations-password-reset-and-email' into 'dev'
Resolve "Redirection to frontend after email confirmation operations (password reset and email)"

Closes #48

See merge request sa4-2020/the-sanmarinoes/backend!62
2020-03-25 20:29:48 +01:00
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
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)
```
La trascrizione dei test è stata fatta in modo certosino, simile a
quello dei monaci emanuensi.
I GRAVISSIMI buggg (3 g perchè fa faigo) potevano rendere il sito
incomprensibile
```
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
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
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
omenem
08c4ef49a7 delete cascade in room 2020-03-24 15:58:01 +01:00
omenem
f368084464 delete cascade no more in switch 2020-03-23 18:31:46 +01:00
omenem
c17b6df3b5 delete cascade no more 2020-03-23 17:53:22 +01:00
f4d6a3f3c7 RoomController PUT fixed 2020-03-23 16:42:33 +01:00
omenem
8813942cc5 fixxed 2020-03-22 18:19:41 +01:00
600529af41 fixed route names 2020-03-21 15:08:36 +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
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
omenem
25c077dd04 Tests for ButtonDimmer 2020-03-17 14:09:20 +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
2b65198df7 updated smartplug 2020-03-16 17:01:21 +01:00
23edc90b81 Fixed @tommi27 uniqueness frenzy for rooms
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)

```
La trascrizione dei test è stata fatta in modo certosino, simile a
quello dei monaci emanuensi.
I GRAVISSIMI buggg (3 g perchè fa faigo) potevano rendere il sito
incomprensibile
```
2020-03-16 14:53:07 +01:00
9c60475e92 Added GET /device route 2020-03-15 17:05:52 +01:00
24fa574c63 Added email confirmation test 2020-03-15 15:06:46 +01:00
620c196393 Implemented fake updates 2020-03-15 14:49:51 +01:00
cf940df6b2 Socket now sends motion sensor updates 2020-03-15 13:51:14 +01:00
5a441a6992 Socket now sends sensor updates 2020-03-15 13:41:57 +01:00
3c034f56d1 Socket authentication works 2020-03-15 10:44:10 +01:00
34dce54575 wip 2020-03-14 20:32:54 +01:00
707291e637 Unauthenticated socket works 2020-03-14 20:32:54 +01:00
589ef8c3cc Imported code from secret source for websockets (@tommi27 you don't know anything about it, right?) 2020-03-14 20:32:54 +01:00