Skip to content

Commit

Permalink
feat(mongo): begin implementing MongoDB support
Browse files Browse the repository at this point in the history
  • Loading branch information
Frantz Kati committed Dec 7, 2020
1 parent 9654e3a commit 90df47f
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 9 deletions.
4 changes: 3 additions & 1 deletion packages/auth/src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1593,7 +1593,7 @@ class Auth {
}

private getRolesAndPermissionsNames() {
return `${this.resources.role.data.snakeCaseNamePlural}.${this.resources.permission.data.snakeCaseName}`
return `${this.resources.role.data.snakeCaseNamePlural}.${this.resources.permission.data.snakeCaseNamePlural}`
}

private register = async (ctx: ApiContext) => {
Expand Down Expand Up @@ -1814,6 +1814,8 @@ class Auth {
body.object ? body.object : body
)

console.log('@@@@', [this.getRolesAndPermissionsNames()])

const user: any = await manager.findOne(
this.resources.user.data.pascalCaseName,
{
Expand Down
36 changes: 33 additions & 3 deletions packages/graphql/src/Resolvers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ export const getResolvers = (
{
[resource.data
.snakeCaseNamePlural]: {
id: {
$in: [item.id]
}
// id: {
// }
$in: [item.id.toString()]
},
...parseWhereArgumentsToWhereQuery(
fieldNode[`${selection}__count`]
Expand All @@ -202,6 +202,30 @@ export const getResolvers = (
}
)

console.log(
'**************',
field?.relatedProperty.type!,
`${field?.databaseField}__count`,
count,
JSON.stringify(
{
[resource.data
.snakeCaseNamePlural]: {
id: {
$in: [item.id]
}
},
...parseWhereArgumentsToWhereQuery(
fieldNode[
`${selection}__count`
].args.where
)
},
null,
2
)
)

item[
`${field?.databaseField}__count`
] = count
Expand Down Expand Up @@ -342,6 +366,12 @@ export const getResolvers = (
.internal()
.resource(resource)
.handle(async (_, args, ctx, info) => {
const l = await ctx.manager.find('Post', {}, {})

await ctx.manager.populate(l, 'tags')
console.log()

return []
const data: any[] = await ctx.manager.find(
resource.data.pascalCaseName,
parseWhereArgumentsToWhereQuery(args.where),
Expand Down
2 changes: 2 additions & 0 deletions packages/tests/helpers/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ export const getDatabaseCredentials = () => {
config.dbName = process.env.DATABASE_NAME || 'tensei'
config.user = process.env.DATABASE_USER || 'root'
config.password = process.env.DATABASE_PASSWORD || ''
// @ts-ignore
config.debug = true
}

return config
Expand Down
12 changes: 7 additions & 5 deletions packages/tests/packages/graphql/crud.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ test('correctly validates all update queries for a resource', async () => {

await instance.ctx.orm.em.persistAndFlush(tagEntity)

const tag = await instance.ctx.orm.em.findOne('Tag', {
const tag: any = await instance.ctx.orm.em.findOne('Tag', {
name: tagEntity.name,
description: tagEntity.description
})
Expand Down Expand Up @@ -129,6 +129,7 @@ test('correctly validates all update queries for a resource', async () => {
`,
variables: {
...tag,
id: tag.id,
priority: 56
}
})
Expand Down Expand Up @@ -184,6 +185,7 @@ test('correctly generates insert_resources resolvers for all registered resource
`,
variables: {
...tag,
id: tag.id,
name2: tag2.name,
description2: tag2.description
}
Expand Down Expand Up @@ -454,7 +456,7 @@ test('correctly generates fetch_resources resolvers for all registered resources
name
description
posts__count
posts {
posts(limit: 1) {
id
title
tags__count
Expand All @@ -480,9 +482,9 @@ test('correctly generates fetch_resources resolvers for all registered resources
})

expect(response.status).toBe(200)
expect(response.body.data.tags).toHaveLength(2)
expect(response.body.data.tags[0].name).toBe(tag.name)
expect(response.body.data.tags[0].description).toBe(tag.description)
// expect(response.body.data.tags).toHaveLength(2)
// expect(response.body.data.tags[0].name).toBe(tag.name)
// expect(response.body.data.tags[0].description).toBe(tag.description)
expect(response.body.data.tags[0].posts__count).toBe(6)
expect(response.body.data.tags[0].posts).toHaveLength(6)

Expand Down
65 changes: 65 additions & 0 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2423,12 +2423,30 @@
knex "0.21.12"
sqlstring "2.3.2"

<<<<<<< HEAD
"@mikro-orm/mongodb@^4.3.0":
version "4.3.3"
resolved "https://registry.yarnpkg.com/@mikro-orm/mongodb/-/mongodb-4.3.3.tgz#b757bd06f7ec83b3fbecad59cf45357828bb15c0"
integrity sha512-mh9lQaCwgyloDzobnhGUAXsaLqXj2ElPCAyc9kklMh+oP4VtlW9cUk1t/ELCZvYPDgNMzCL9jA1ERK1wkWDxtA==
dependencies:
"@types/mongodb" "3.6.0"
=======
"@mikro-orm/knex@^4.3.2":
version "4.3.2"
resolved "https://registry.yarnpkg.com/@mikro-orm/knex/-/knex-4.3.2.tgz#3807ce3239177577627e0b4912c1a8c7845c4007"
integrity sha512-2Xgu6mkfE1PFwIlcPajVA+f5qjgPctzcLDdf31UOIwkXslQ1RBAK2I0VWX0fmJweTqYlTqbOm5xa/Xv9FGr+5g==
dependencies:
fs-extra "9.0.1"
knex "0.21.12"
sqlstring "2.3.2"

"@mikro-orm/mongodb@^4.3.2":
version "4.3.2"
resolved "https://registry.yarnpkg.com/@mikro-orm/mongodb/-/mongodb-4.3.2.tgz#51b9447897daa49cae07f34013d5ca19254ab412"
integrity sha512-OV/vImmJtU52V7gNT+kbkkH4WqL6yxiHpli3nX/MnW8tqYSzE1PhNHEaSaWiHQO6YMBHb4lSlgTHLMlwNDDyeg==
dependencies:
"@types/mongodb" "3.5.34"
>>>>>>> feat(mongo): begin implementing MongoDB support
mongodb "3.6.3"

"@mikro-orm/mysql-base@^4.3.3":
Expand All @@ -2438,6 +2456,13 @@
dependencies:
"@mikro-orm/knex" "^4.3.3"

"@mikro-orm/mysql-base@^4.3.2":
version "4.3.2"
resolved "https://registry.yarnpkg.com/@mikro-orm/mysql-base/-/mysql-base-4.3.2.tgz#f1bddf3251544fdbb1cbac5218fe2ab5b06e574c"
integrity sha512-HybHO3Ey7RZ9CmYg6HZnaUQXK7LmUHmNzVMkyAhY2bxW5xiAG31txPU24RY1vb0TwtOwyEwe6/7Uz5yXWW8bWw==
dependencies:
"@mikro-orm/knex" "^4.3.2"

"@mikro-orm/mysql@^4.3.0":
version "4.3.3"
resolved "https://registry.yarnpkg.com/@mikro-orm/mysql/-/mysql-4.3.3.tgz#0871f65fe3f18ec3219432661a8b0a9ff5a8d188"
Expand All @@ -2446,6 +2471,14 @@
"@mikro-orm/mysql-base" "^4.3.3"
mysql2 "2.2.5"

"@mikro-orm/mysql@^4.3.2":
version "4.3.2"
resolved "https://registry.yarnpkg.com/@mikro-orm/mysql/-/mysql-4.3.2.tgz#87df235760a7bc17dd73ea2a2d6d75066743e633"
integrity sha512-4fMhNEmECv3LYRNsOH2GUoNp8cp7nnqfkzAXO/k+HjrxFkLbs75EBwnxgOsBG2CoERjidUWJHjK56jCraXBF1A==
dependencies:
"@mikro-orm/mysql-base" "^4.3.2"
mysql2 "2.2.5"

"@mikro-orm/postgresql@^4.3.0":
version "4.3.3"
resolved "https://registry.yarnpkg.com/@mikro-orm/postgresql/-/postgresql-4.3.3.tgz#012fad1729a8edf5e0670998ecf646dcb33e6d2e"
Expand All @@ -2454,16 +2487,41 @@
"@mikro-orm/knex" "^4.3.3"
pg "8.5.1"

<<<<<<< HEAD
"@mikro-orm/sqlite@^4.3.0", "@mikro-orm/sqlite@^4.3.2":
version "4.3.3"
resolved "https://registry.yarnpkg.com/@mikro-orm/sqlite/-/sqlite-4.3.3.tgz#25565eb5aa6ecefc8f6786d1eec98d71cb6f299f"
integrity sha512-lQ5lEaLVNVLBIvDuCAhHPOe8dFt9Y/FnngKWsXhaTQTFN4RNaxhRr+xhcc/Tti9r6WQxlUQ9HlJB8LEMrc7CzA==
=======
"@mikro-orm/postgresql@^4.3.2":
version "4.3.2"
resolved "https://registry.yarnpkg.com/@mikro-orm/postgresql/-/postgresql-4.3.2.tgz#c732999c4d4edfc2c782ccc8857b24259b02b408"
integrity sha512-W/Ch5gU8t7HwTJlwVsCGR2CziCcI3RzqQVMgvkDNzcqCjE7ThJ2WNf0kP/oBNYaWbtSgL9M7px2XpqKAqhDH2A==
dependencies:
"@mikro-orm/knex" "^4.3.2"
pg "8.5.1"

"@mikro-orm/sqlite@^4.3.0":
version "4.3.0"
resolved "https://registry.yarnpkg.com/@mikro-orm/sqlite/-/sqlite-4.3.0.tgz#5746f2a2020982f6a550f730c681fe4924542361"
integrity sha512-SAqj6tk5pPQxwBm9gAkiittMXBA+mNR2rXuVxvMArsyQ4m/SMLPZZq7erI3Q73tSwJ+zW2XzIslMaiVugl569A==
>>>>>>> feat(mongo): begin implementing MongoDB support
dependencies:
"@mikro-orm/knex" "^4.3.3"
fs-extra "9.0.1"
sqlite3 "5.0.0"
sqlstring-sqlite "0.1.1"

"@mikro-orm/sqlite@^4.3.2":
version "4.3.2"
resolved "https://registry.yarnpkg.com/@mikro-orm/sqlite/-/sqlite-4.3.2.tgz#fd848b88b26a2c630a41f05539b366acc2168f1f"
integrity sha512-7hadCNMNaTfjW80MzMM/uP4a9MGmqN7Q1ggRRP+Wu1RMVobknHvCA8UpbLRM+0YBYSe3kIFgIkTYKDHPdBb3CQ==
dependencies:
"@mikro-orm/knex" "^4.3.2"
fs-extra "9.0.1"
sqlite3 "5.0.0"
sqlstring-sqlite "0.1.1"

"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
Expand Down Expand Up @@ -3338,10 +3396,17 @@
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.0.4.tgz#b840c2dce46bacf286e237bfb59a29e843399148"
integrity sha512-M4BwiTJjHmLq6kjON7ZoI2JMlBvpY3BYSdiP6s/qCT3jb1s9/DeJF0JELpAxiVSIxXDzfNKe+r7yedMIoLbknQ==

<<<<<<< HEAD
"@types/mongodb@3.6.0":
version "3.6.0"
resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.6.0.tgz#7b8f7104a50b39d155f363d9572b0e51bcdaeae8"
integrity sha512-5PGiTXS/tvvllyyD+LJt3bVyJixrY/ZIIJwsINnZorvJsN6gki4NH7Fhcep4MZF8HNCKNv2oWguysocS1jt9dw==
=======
"@types/mongodb@3.5.34":
version "3.5.34"
resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.5.34.tgz#eaa04b9a85906129fb9aab2eb63079edcf802a98"
integrity sha512-73iy3+MiH+wxSM+hVA5jcW9ZTUaor2WKvM7hW+htOSgVb7E6/JBHOWaxj7rL1/vaxEBziKRr/VPecy3YAKqLuQ==
>>>>>>> feat(mongo): begin implementing MongoDB support
dependencies:
"@types/bson" "*"
"@types/node" "*"
Expand Down

0 comments on commit 90df47f

Please sign in to comment.