Commit graph

620 commits

Author SHA1 Message Date
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
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
Jacob Salvi
ac92344b53 added tags: dind 2020-03-16 14:28:35 +01:00
a79c5d8671 Merge branch '32-add-get-device-call-to-get-all-devices-of-a-user' into 'dev'
Resolve "Add GET /device call to get all devices of a user"

Closes #32

See merge request sa4-2020/the-sanmarinoes/backend!40
2020-03-15 17:13:52 +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
7e53ccd608 Merge branch '28-implement-websockets-for-sensors-and-motion-sensors' into 'dev'
Resolve "Implement fake updates trough websockets for sensors and motion sensors"

Closes #28

See merge request sa4-2020/the-sanmarinoes/backend!37
2020-03-15 14:56:15 +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
fd6103b6da Merge branch 'websockets-feature' into 'dev'
Import and adapt code from secret source for websockets (@tommi27 you don't know anything about it, right?)

See merge request sa4-2020/the-sanmarinoes/backend!30
2020-03-15 11:08:41 +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
1e2bb75181 Merge branch 'web-socket-feature' into 'dev'
Better .gitignore and uniqueness constraints

See merge request sa4-2020/the-sanmarinoes/backend!36
2020-03-14 20:27:05 +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
082c420d6c Merge branch '5-add-delete-or-modify-rooms' into 'dev'
Resolve "Add, Delete, or Modify rooms"

Closes #5

See merge request sa4-2020/the-sanmarinoes/backend!35
2020-03-14 19:56:28 +01:00
5683bbe3e3 Added room icons in model as enum 2020-03-14 19:51:01 +01:00
23e3293e9c Merge branch '26-redefine-device-update-calls-in-rest-api-as-single-route-and-have-specialized-routes-for' into 'dev'
Resolve "Redefine device update calls in REST api as single route and have specialized routes for triggers on input devices"

Closes #26

See merge request sa4-2020/the-sanmarinoes/backend!34
2020-03-14 17:06:18 +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
f1fc5a83c1 Merge branch 'ci-cd' into 'dev'
Added an initial pipeline for the continous integration

See merge request sa4-2020/the-sanmarinoes/backend!32
2020-03-12 17:55:50 +01:00
5995bfcad2 Allowed failures (for now) for CPD check 2020-03-12 17:47:40 +01:00
Jacob Salvi
90d951d2ac Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into ci-cd
# Conflicts:
#	build.gradle
2020-03-12 17:22:40 +01:00
c74865e3a3 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into ci-cd 2020-03-12 16:24:57 +01:00
beeb5d82a9 Merge branch '27-tests-fail-since-h2-version-is-old' into 'dev'
Resolve "Tests fail since h2 version is old"

Closes #27

See merge request sa4-2020/the-sanmarinoes/backend!33
2020-03-12 16:23:38 +01:00
60f81c3cc1 Fixed h2 version in tests 2020-03-12 16:23:02 +01:00
Jacob Salvi
9daa9a8a42 Added an initial pipeline for the continous integration 2020-03-11 17:35:04 +01:00