Skip to content

Commit

Permalink
fix: Find Messages
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonas-notcat
simonas-notcat committed Mar 11, 2020
1 parent d8fbbbc commit 5234c54
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 80 deletions.
53 changes: 17 additions & 36 deletions examples/react-app/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3556,75 +3556,56 @@ d@1, d@^1.0.1:
es5-ext "^0.10.50"
type "^1.0.1"

daf-core@../../packages/daf-core:
version "2.3.16"
dependencies:
blakejs "^1.1.0"
debug "^4.1.1"
events "^3.0.0"
typeorm "^0.2.24"

daf-core@^2.3.16, daf-core@^2.3.18:
daf-core@../../packages/daf-core, daf-core@^2.3.18:
version "2.3.18"
resolved "https://registry.yarnpkg.com/daf-core/-/daf-core-2.3.18.tgz#2938b79d5531ce799bdee5ab6a4115324728162b"
integrity sha512-CLNY8ioGnxe+kCDNEefpzaEf/z9bXob0Mjnujckf/2k6zPHDMPDLRNLBwZWi+LRivyyOq00VBcKnHZrlfLH+Hw==
dependencies:
blakejs "^1.1.0"
debug "^4.1.1"
events "^3.0.0"
typeorm "^0.2.24"

daf-debug@../../packages/daf-debug:
version "2.3.16"
version "2.3.18"
dependencies:
daf-core "^2.3.16"
daf-core "^2.3.18"
debug "^4.1.1"

daf-did-jwt@../../packages/daf-did-jwt:
version "2.3.16"
dependencies:
daf-core "^2.3.16"
debug "^4.1.1"
did-jwt "^4.0.0"
did-resolver "^1.1.0"

daf-did-jwt@^2.3.16:
daf-did-jwt@../../packages/daf-did-jwt, daf-did-jwt@^2.3.18:
version "2.3.18"
resolved "https://registry.yarnpkg.com/daf-did-jwt/-/daf-did-jwt-2.3.18.tgz#76336f6432113afda9dacfe8487e5107a03673de"
integrity sha512-Tv/RNtI6xGPxjzI6rNA+byIycx7dwSXLQAlXr01jKPvSoB+Z9ZJ1xIdCvORGwJ6TDDf/xdrLc9WgBUJyemwZ+A==
dependencies:
daf-core "^2.3.18"
debug "^4.1.1"
did-jwt "^4.0.0"
did-resolver "^1.1.0"

daf-ethr-did@../../packages/daf-ethr-did:
version "2.3.17"
version "2.3.18"
dependencies:
daf-core "^2.3.16"
daf-core "^2.3.18"
debug "^4.1.1"
ethjs-provider-signer "^0.1.4"
ethr-did "^1.1.0"
js-sha3 "^0.8.0"

daf-libsodium@../../packages/daf-libsodium:
version "2.3.16"
version "2.3.18"
dependencies:
base-58 "^0.0.1"
daf-core "^2.3.16"
daf-core "^2.3.18"
debug "^4.1.1"
did-jwt "^4.0.0"
elliptic "^6.5.2"
ethjs-signer "^0.1.1"
libsodium-wrappers "^0.7.6"

daf-local-storage@../../packages/daf-local-storage:
version "2.3.16"
version "2.3.18"
dependencies:
daf-core "^2.3.16"
daf-core "^2.3.18"
debug "^4.1.1"

daf-resolver@../../packages/daf-resolver:
version "2.3.15"
version "2.3.18"
dependencies:
debug "^4.1.1"
did-resolver "^1.1.0"
Expand All @@ -3633,7 +3614,7 @@ daf-resolver@../../packages/daf-resolver:
web-did-resolver "^1.2.0"

daf-trust-graph@../../packages/daf-trust-graph:
version "2.3.16"
version "2.3.18"
dependencies:
apollo-cache-inmemory "^1.6.3"
apollo-client "^2.6.4"
Expand All @@ -3642,18 +3623,18 @@ daf-trust-graph@../../packages/daf-trust-graph:
apollo-link-ws "^1.0.19"
apollo-utilities "^1.3.2"
cross-fetch "^3.0.4"
daf-core "^2.3.16"
daf-core "^2.3.18"
debug "^4.1.1"
did-jwt "^4.0.0"
graphql "^14.0.0"
graphql-tag "^2.10.1"
subscriptions-transport-ws "^0.9.0"

daf-w3c@../../packages/daf-w3c:
version "2.3.16"
version "2.3.18"
dependencies:
daf-core "^2.3.16"
daf-did-jwt "^2.3.16"
daf-core "^2.3.18"
daf-did-jwt "^2.3.18"
debug "^4.1.1"
did-jwt-vc "^0.1.3"
did-resolver "^1.1.0"
Expand Down
53 changes: 17 additions & 36 deletions examples/react-graphql/server/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -867,77 +867,58 @@ cross-fetch@^3.0.4:
node-fetch "2.6.0"
whatwg-fetch "3.0.0"

daf-core@../../../packages/daf-core:
version "2.3.16"
dependencies:
blakejs "^1.1.0"
debug "^4.1.1"
events "^3.0.0"
typeorm "^0.2.24"

daf-core@^2.3.16, daf-core@^2.3.18:
daf-core@../../../packages/daf-core, daf-core@^2.3.18:
version "2.3.18"
resolved "https://registry.yarnpkg.com/daf-core/-/daf-core-2.3.18.tgz#2938b79d5531ce799bdee5ab6a4115324728162b"
integrity sha512-CLNY8ioGnxe+kCDNEefpzaEf/z9bXob0Mjnujckf/2k6zPHDMPDLRNLBwZWi+LRivyyOq00VBcKnHZrlfLH+Hw==
dependencies:
blakejs "^1.1.0"
debug "^4.1.1"
events "^3.0.0"
typeorm "^0.2.24"

daf-data-store@../../../packages/daf-data-store:
version "2.3.16"
version "2.3.18"
dependencies:
blakejs "^1.1.0"
daf-core "^2.3.16"
daf-core "^2.3.18"
debug "^4.1.1"
sql-bricks-sqlite "^0.1.0"

daf-debug@../../../packages/daf-debug:
version "2.3.16"
dependencies:
daf-core "^2.3.16"
debug "^4.1.1"

daf-did-jwt@../../../packages/daf-did-jwt:
version "2.3.16"
version "2.3.18"
dependencies:
daf-core "^2.3.16"
daf-core "^2.3.18"
debug "^4.1.1"
did-jwt "^4.0.0"
did-resolver "^1.1.0"

daf-did-jwt@^2.3.16:
daf-did-jwt@../../../packages/daf-did-jwt, daf-did-jwt@^2.3.18:
version "2.3.18"
resolved "https://registry.yarnpkg.com/daf-did-jwt/-/daf-did-jwt-2.3.18.tgz#76336f6432113afda9dacfe8487e5107a03673de"
integrity sha512-Tv/RNtI6xGPxjzI6rNA+byIycx7dwSXLQAlXr01jKPvSoB+Z9ZJ1xIdCvORGwJ6TDDf/xdrLc9WgBUJyemwZ+A==
dependencies:
daf-core "^2.3.18"
debug "^4.1.1"
did-jwt "^4.0.0"
did-resolver "^1.1.0"

daf-ethr-did@../../../packages/daf-ethr-did:
version "2.3.17"
version "2.3.18"
dependencies:
daf-core "^2.3.16"
daf-core "^2.3.18"
debug "^4.1.1"
ethjs-provider-signer "^0.1.4"
ethr-did "^1.1.0"
js-sha3 "^0.8.0"

daf-libsodium@../../../packages/daf-libsodium:
version "2.3.16"
version "2.3.18"
dependencies:
base-58 "^0.0.1"
daf-core "^2.3.16"
daf-core "^2.3.18"
debug "^4.1.1"
did-jwt "^4.0.0"
elliptic "^6.5.2"
ethjs-signer "^0.1.1"
libsodium-wrappers "^0.7.6"

daf-resolver@../../../packages/daf-resolver:
version "2.3.15"
version "2.3.18"
dependencies:
debug "^4.1.1"
did-resolver "^1.1.0"
Expand All @@ -946,7 +927,7 @@ daf-resolver@../../../packages/daf-resolver:
web-did-resolver "^1.2.0"

daf-trust-graph@../../../packages/daf-trust-graph:
version "2.3.16"
version "2.3.18"
dependencies:
apollo-cache-inmemory "^1.6.3"
apollo-client "^2.6.4"
Expand All @@ -955,18 +936,18 @@ daf-trust-graph@../../../packages/daf-trust-graph:
apollo-link-ws "^1.0.19"
apollo-utilities "^1.3.2"
cross-fetch "^3.0.4"
daf-core "^2.3.16"
daf-core "^2.3.18"
debug "^4.1.1"
did-jwt "^4.0.0"
graphql "^14.0.0"
graphql-tag "^2.10.1"
subscriptions-transport-ws "^0.9.0"

daf-w3c@../../../packages/daf-w3c:
version "2.3.16"
version "2.3.18"
dependencies:
daf-core "^2.3.16"
daf-did-jwt "^2.3.16"
daf-core "^2.3.18"
daf-did-jwt "^2.3.18"
debug "^4.1.1"
did-jwt-vc "^0.1.3"
did-resolver "^1.1.0"
Expand Down
12 changes: 4 additions & 8 deletions packages/daf-data-store/src/data-store.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,22 +110,18 @@ export class DataStore {
threadId?: string
limit?: number
}) {
let where = {}
let where = []

if (threadId) {
where['threadId'] = threadId
where.push({ threadId: threadId })
}

if (sender) {
const identity = new Identity()
identity.did = sender
where['from'] = identity
where.push({ from: sender })
}

if (receiver) {
const identity = new Identity()
identity.did = receiver
where['to'] = identity
where.push({ to: receiver })
}

const messages = await Message.find({ where, relations: ['from', 'to'] })
Expand Down

0 comments on commit 5234c54

Please sign in to comment.