Merge conflict fix
This commit is contained in:
commit
0c7b4025c5
13 files changed
+4416
-4415
No files matched your search
+7
-7
@@ -8,7 +8,7 @@ import jwksRsa from 'jwks-rsa'
|
||||
import axios from 'axios'
|
||||
|
||||
import { createTransformedRemoteSchema } from './createRemoteSchema'
|
||||
import { teams, hosts } from './links'
|
||||
import { teams, events } from './links'
|
||||
import logger from './logger'
|
||||
|
||||
async function getUserId (authId) {
|
||||
@@ -36,7 +36,7 @@ async function getUserId (authId) {
|
||||
async function run () {
|
||||
const transformedTeamsSchema = await createTransformedRemoteSchema('teams_', process.env.TEAMS_API_URL)
|
||||
const transformedUsersSchema = await createTransformedRemoteSchema('users_', process.env.USERS_API_URL)
|
||||
const transformedHostsSchema = await createTransformedRemoteSchema('hosts_', process.env.HOSTS_API_URL)
|
||||
const transformedEventsSchema = await createTransformedRemoteSchema('events_', process.env.EVENTS_API_URL)
|
||||
const transformedKeyVaultSchema = await createTransformedRemoteSchema('keyVault_', process.env.KEYVAULT_API_URL)
|
||||
|
||||
var schemas = []
|
||||
@@ -52,11 +52,11 @@ async function run () {
|
||||
if (transformedUsersSchema) {
|
||||
schemas.push(transformedUsersSchema)
|
||||
}
|
||||
if (transformedHostsSchema) {
|
||||
schemas.push(transformedHostsSchema)
|
||||
if (transformedEventsSchema) {
|
||||
schemas.push(transformedEventsSchema)
|
||||
if (transformedUsersSchema && transformedTeamsSchema) {
|
||||
schemas.push(hosts.linkSchemaDefs)
|
||||
resolvers = Object.assign(resolvers, hosts.resolver(transformedUsersSchema, transformedTeamsSchema))
|
||||
schemas.push(events.linkSchemaDefs)
|
||||
resolvers = Object.assign(resolvers, events.resolver(transformedUsersSchema, transformedTeamsSchema))
|
||||
}
|
||||
}
|
||||
if (transformedKeyVaultSchema) {
|
||||
@@ -139,7 +139,7 @@ async function run () {
|
||||
return error
|
||||
},
|
||||
formatResponse: response => {
|
||||
logger.info('Response from Apolo Server: ', response)
|
||||
logger.debug('Response from Apolo Server: ', response)
|
||||
return response
|
||||
},
|
||||
playground: {
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
export const linkSchemaDefs =
|
||||
`
|
||||
extend type hosts_Event {
|
||||
extend type events_Event {
|
||||
host: users_User
|
||||
}
|
||||
extend type hosts_Participant {
|
||||
extend type events_Participant {
|
||||
team: teams_Team
|
||||
}
|
||||
`
|
||||
|
||||
export const resolver = (usersSchema, teamsSchema) => ({
|
||||
hosts_Event: {
|
||||
events_Event: {
|
||||
host: {
|
||||
fragment: `fragment UserFragment on hosts_Event{hostId}`,
|
||||
fragment: `fragment UserFragment on events_Event{hostId}`,
|
||||
resolve (parent, args, context, info) {
|
||||
return info.mergeInfo.delegateToSchema({
|
||||
schema: usersSchema,
|
||||
@@ -24,9 +24,9 @@ export const resolver = (usersSchema, teamsSchema) => ({
|
||||
}
|
||||
}
|
||||
},
|
||||
hosts_Participant: {
|
||||
events_Participant: {
|
||||
team: {
|
||||
fragment: `fragment TeamFragment on hosts_Participant{teamId}`,
|
||||
fragment: `fragment TeamFragment on events_Participant{teamId}`,
|
||||
resolve (parent, args, context, info) {
|
||||
return info.mergeInfo.delegateToSchema({
|
||||
schema: teamsSchema,
|
||||
@@ -1,4 +1,4 @@
|
||||
import teams from './teams'
|
||||
import hosts from './hosts'
|
||||
import events from './events'
|
||||
|
||||
export { teams, hosts }
|
||||
export { teams, events }
|
||||
@@ -15,7 +15,7 @@ const options = {
|
||||
timestamp: true
|
||||
},
|
||||
console: {
|
||||
level: 'debug',
|
||||
level: 'info',
|
||||
handleExceptions: true,
|
||||
json: false,
|
||||
colorize: true,
|
||||
|
||||
Reference in new issue
Block a user