MF-859 - Channels metadata search #867

mteodor · 2019-09-19T09:51:25Z

What does this do?

add retrieve channels my metadata criteria

Which issue(s) does this PR fix/relate to?

Put here Resolves #XXX to auto-close the issue that your PR fixes (if such)
Resolves #859

List any changes that modify/break current functionality

Have you included tests for your changes?

Did you document any new/modified functionality?

Notes

scripts/run.sh

codecov-io · 2019-09-25T09:06:59Z

Codecov Report

Merging #867 into master will increase coverage by 0.07%.
The diff coverage is 83.95%.

@@            Coverage Diff             @@
##           master     #867      +/-   ##
==========================================
+ Coverage    84.7%   84.77%   +0.07%     
==========================================
  Files          72       72              
  Lines        4811     4834      +23     
==========================================
+ Hits         4075     4098      +23     
- Misses        496      497       +1     
+ Partials      240      239       -1

Impacted Files	Coverage Δ
things/redis/streams.go	`90.47% <100%> (ø)`	⬆️
things/postgres/init.go	`93.44% <100%> (+0.85%)`	⬆️
things/api/things/http/endpoint.go	`98.23% <100%> (ø)`	⬆️
things/service.go	`88.02% <100%> (ø)`	⬆️
things/postgres/channels.go	`82.2% <80%> (+1.64%)`	⬆️
things/postgres/things.go	`80.88% <81.81%> (-0.37%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 92a640f...57b2547. Read the comment docs.

scripts/run.sh

chombium · 2019-09-25T18:32:22Z

@drasko 10 seconds is the maximum time which we wait until natsd is started. It's a timeout when we give up.
It is checked if a connection can be made on the port 4222 and if that's not possible, the script sleeps for half a second and tries again. In a case where natsd starts before the timeout is fired(within 10 seconds), the maximum extra time which the user waits is half a second.

drasko · 2019-09-25T22:28:38Z

@chombium I know, but I think there is no need to wait 10 seconds. If NATS does not start in 3-5 sec - there is probably something wrong beyond repair, better break out.

I can accept this, but never the less I think it is not needed...

things/postgres/channels.go

chombium · 2019-09-27T20:41:56Z

@drasko I agree with you. If we are sure that 3-5 seconds are enough than we can lower the timeout

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

users/api/http/requests.go

mteodor · 2019-09-28T16:06:43Z

I think yes

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

manuio

LGTM

drasko

LGTM

dborovcanin · 2019-09-30T15:54:15Z

things/postgres/channels.go

+	b, ok := value.([]byte)
+	if !ok {
+		m = &dbMetadata{}
+		return users.ErrScanMetadata


Why users.ErrScanMetadata?

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

things/things.go

things/postgres/channels.go

users/users.go

things/postgres/channels.go

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

anovakovic01

LGTM!

drasko

LGTM

* add users metadata Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add users metadata Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add metadata to users Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add metadata to users Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * run.sh Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add metadata to users Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add default value for metadata Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add default value for metadata Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * when metadata is not set dont save 'null' string Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * when metadata is not set dont save 'null' string Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add metadata to channels Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add metadata to channels Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * change metadata type, add error handling Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pause Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove extra char Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * retype from string to []byte Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add metadata to channels Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add metadata to channels Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add wait logic for gnatsd Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * few small fixes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix identityRes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add metadata to channels Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add metadata to channels Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add metadata to channels Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix waiting for gnatsd Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix waiting for gnatsd Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix waiting for gnatsd Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * changes to wait gnatsd logic Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * changes to wait gnatsd logic Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * testing query Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix query Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix query Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix merge problem Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * Update requests.go Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * Delete pwdrecovery.go Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix merge problem Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix merge problem Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * small change in comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove unused struct Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

mteodor requested a review from a team as a code owner September 19, 2019 09:51

mteodor added the work-in-progress label Sep 19, 2019

mteodor force-pushed the channels-metadata branch from de3d278 to 58771aa Compare September 23, 2019 08:26

mteodor removed the work-in-progress label Sep 23, 2019

drasko requested changes Sep 24, 2019

View reviewed changes

scripts/run.sh Outdated Show resolved Hide resolved

drasko mentioned this pull request Sep 24, 2019

MF-858 Users metadata #861

Merged

mteodor force-pushed the channels-metadata branch from 021bb34 to 9293d49 Compare September 25, 2019 09:01

chombium reviewed Sep 25, 2019

View reviewed changes

scripts/run.sh Outdated Show resolved Hide resolved

chombium reviewed Sep 25, 2019

View reviewed changes

scripts/run.sh Outdated Show resolved Hide resolved

drasko requested changes Sep 25, 2019

View reviewed changes

scripts/run.sh Outdated Show resolved Hide resolved

manuio suggested changes Sep 25, 2019

View reviewed changes

things/postgres/channels.go Outdated Show resolved Hide resolved

things/postgres/channels.go Outdated Show resolved Hide resolved

mteodor force-pushed the channels-metadata branch from 85d0459 to aa1f892 Compare September 27, 2019 13:03

mteodor added 14 commits September 28, 2019 13:22

add users metadata

0a02e1f

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

add users metadata

b732e93

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

add metadata to users

bbc199d

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

add metadata to users

45ed982

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

run.sh

e253e15

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

add metadata to users

6fa33d6

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

add default value for metadata

15f5e82

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

add default value for metadata

4684011

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

when metadata is not set dont save 'null' string

ccd8ac7

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

when metadata is not set dont save 'null' string

1279340

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

add metadata to channels

555cf3a

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

add metadata to channels

d353ec4

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

change metadata type, add error handling

82b85db

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

add pause

9e508f6

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

mteodor added 7 commits September 28, 2019 13:35

fix waiting for gnatsd

8fe1b9c

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

fix waiting for gnatsd

af6b059

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

changes to wait gnatsd logic

c03b395

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

changes to wait gnatsd logic

be9e3be

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

testing query

c17adab

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

fix query

fa55d3e

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

fix query

9d36b8f

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

mteodor force-pushed the channels-metadata branch from 83d2acb to 9d36b8f Compare September 28, 2019 11:35

fix merge problem

cd3cdd9

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

drasko reviewed Sep 28, 2019

View reviewed changes

users/api/http/requests.go Outdated Show resolved Hide resolved

mteodor added 4 commits September 28, 2019 18:18

Update requests.go

bfa7410

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

Delete pwdrecovery.go

66079c2

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

fix merge problem

95723e9

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

fix merge problem

d2b297b

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

manuio previously approved these changes Sep 30, 2019

View reviewed changes

drasko previously approved these changes Sep 30, 2019

View reviewed changes

dborovcanin requested changes Sep 30, 2019

View reviewed changes

small change in comments

df2f878

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

mteodor dismissed stale reviews from drasko and manuio via df2f878 September 30, 2019 16:46

drasko requested changes Sep 30, 2019

View reviewed changes

things/things.go Show resolved Hide resolved

things/postgres/channels.go Outdated Show resolved Hide resolved

things/postgres/channels.go Outdated Show resolved Hide resolved

anovakovic01 suggested changes Oct 1, 2019

View reviewed changes

users/users.go Outdated Show resolved Hide resolved

things/postgres/channels.go Outdated Show resolved Hide resolved

mteodor added 2 commits October 1, 2019 11:44

remove unused struct

83e23cd

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

fix comments

57b2547

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

anovakovic01 approved these changes Oct 1, 2019

View reviewed changes

dborovcanin approved these changes Oct 1, 2019

View reviewed changes

drasko approved these changes Oct 1, 2019

View reviewed changes

drasko merged commit ecc15b6 into absmach:master Oct 1, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MF-859 - Channels metadata search #867

MF-859 - Channels metadata search #867

mteodor commented Sep 19, 2019

codecov-io commented Sep 25, 2019 •

edited

Loading

chombium commented Sep 25, 2019

drasko commented Sep 25, 2019

chombium commented Sep 27, 2019

mteodor commented Sep 28, 2019

manuio left a comment

drasko left a comment

dborovcanin Sep 30, 2019

anovakovic01 left a comment

drasko left a comment

MF-859 - Channels metadata search #867

MF-859 - Channels metadata search #867

Conversation

mteodor commented Sep 19, 2019

What does this do?

Which issue(s) does this PR fix/relate to?

List any changes that modify/break current functionality

Have you included tests for your changes?

Did you document any new/modified functionality?

Notes

codecov-io commented Sep 25, 2019 • edited Loading

Codecov Report

chombium commented Sep 25, 2019

drasko commented Sep 25, 2019

chombium commented Sep 27, 2019

mteodor commented Sep 28, 2019

manuio left a comment

Choose a reason for hiding this comment

drasko left a comment

Choose a reason for hiding this comment

dborovcanin Sep 30, 2019

Choose a reason for hiding this comment

anovakovic01 left a comment

Choose a reason for hiding this comment

drasko left a comment

Choose a reason for hiding this comment

codecov-io commented Sep 25, 2019 •

edited

Loading