Commit graph

114 commits

Author SHA1 Message Date
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
873ef54e13 Merge branch 'dev' into 'web-socket-feature' 2020-03-14 20:22:01 +01:00
73e1328d70 Branch cleaning 2020-03-14 20:07:58 +01:00
5683bbe3e3 Added room icons in model as enum 2020-03-14 19:51:01 +01:00
f52a38082c General rewrite of device controllers. Now only output devices can be
changes with a PUT call on their controller. Other devices use the
generic controller.
2020-03-14 16:59:56 +01:00
ed2900a3bc New abstraction for connections 2020-03-14 12:40:28 +01:00
6fef7663dd Knob dimmer now with new rest conversation scheme 2020-03-13 18:48:19 +01:00
3a97d40858 Button dimmer now with new rest conversation scheme 2020-03-13 18:20:16 +01:00
7bb05b705f Neutralized id value from client in device routes for creation.
Reconfigured Springfox for authentication in device and room routes.
2020-03-13 15:48:20 +01:00
60f81c3cc1 Fixed h2 version in tests 2020-03-12 16:23:02 +01:00
070dde4e69 Fixed CORS config 2020-03-10 15:03:23 +01:00
ca63f0d7df Merge branch 'dev' into '21-test-endpoints'
# Conflicts:
#   build.gradle
2020-03-09 23:14:46 +01:00
dfdf9ba361 Added all paths to swagger documentation 2020-03-09 23:12:39 +01:00
0d9982fb50 Fixed email configuration 2020-03-09 17:06:59 +01:00
omenem
8838beb0e0 Removed setId methods from DTO classes 2020-03-08 18:58:45 +01:00
57e9a53cf1 Password reset manually tested and fixed 2020-03-06 11:10:58 +01:00
860fae779d Added support for password reset (still needs testing) 2020-03-06 10:24:06 +01:00
a0fe5f989a Revert "Added support for password reset (still needs testing)"
This reverts commit 7396e6f0d9.
2020-03-06 10:21:36 +01:00
7396e6f0d9 Added support for password reset (still needs testing) 2020-03-05 17:07:29 +01:00
748c5ba4b4 Added more tests on login/registration 2020-03-05 15:03:23 +01:00
e8a55ae131 Started work on tests 2020-03-05 12:42:53 +01:00
6d2f7a25fb Merge branch '20-put-post-on-room-does-not-move-room-name-in-dto' into 'dev'
Resolve "PUT/POST on room does not move room name in DTO"

Closes #20

See merge request sa4-2020/the-sanmarinoes/backend!24
2020-03-04 17:15:05 +01:00
3dfcd30f4e Fixed POST /room (Git merge I will avenge you) 2020-03-04 17:01:09 +01:00