fLotte-meets-HWR-DB
/
apollo-server
mirror of https://github.com/fLotte-meets-HWR-DB/apollo-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from fLotte-meets-HWR-DB/develop

Browse Source 
Fix field names, comments and nullables
pull/20/head
leonnicolas 4 years ago committed by GitHub
parent 03d9cdf1db 9ec2e0602f
commit 448ab2ba28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1060 additions and 1051 deletions
Show Stats Download Patch File Download Diff File

2
src/resolvers/lendingStationResolvers.ts
Unescape Escape View File

@ -45,7 +45,7 @@ export default {
return new GraphQLError('Insufficient Permissions'); return new GraphQLError('Insufficient Permissions');
} }
}, },
timeframes: (_: any, { offset, limit }: { offset: number, limit: number }, { dataSources, req }: { dataSources: any, req: any }) => { timeFrames: (_: any, { offset, limit }: { offset: number, limit: number }, { dataSources, req }: { dataSources: any, req: any }) => {
if (req.permissions.includes(Permission.ReadTimeFrame)) { if (req.permissions.includes(Permission.ReadTimeFrame)) {
return dataSources.lendingStationAPI.timeFrames(offset, limit); return dataSources.lendingStationAPI.timeFrames(offset, limit);
} else { } else {

69
src/schema/type-defs.ts
Unescape Escape View File

@ -33,7 +33,6 @@ There is a currency signe at the first position or second position if - is set.
The kind of currency depends on the database. The kind of currency depends on the database.
""" """
scalar Money scalar Money
"The CargoBike type is central to the graph. You could call it the root." "The CargoBike type is central to the graph. You could call it the root."
type CargoBike { type CargoBike {
id: ID! id: ID!
@ -357,6 +356,9 @@ enum Group{
TK TK
} }
"""
A participant in the organization
"""
type Participant { type Participant {
id: ID! id: ID!
start: Date! start: Date!
@ -417,6 +419,9 @@ input ParticipantUpdateInput {
keepLock: Boolean keepLock: Boolean
} }
"""
A workshop event
"""
type Workshop { type Workshop {
id: ID! id: ID!
title: String! title: String!
@ -582,6 +587,10 @@ input EquipmentUpdateInput {
keepLock: Boolean keepLock: Boolean
} }
"""
A type of equipment that is not being tracked but can be assigned
to any bike.
"""
type EquipmentType { type EquipmentType {
id: ID! id: ID!
name: String! name: String!
@ -617,7 +626,7 @@ type BikeEvent {
""" """
Path to documents Path to documents
""" """
documents: [String]! documents: [String!]!
remark: String remark: String
isLocked: Boolean! isLocked: Boolean!
isLockedByMe: Boolean! isLockedByMe: Boolean!
@ -676,7 +685,7 @@ type Provider {
formName: String formName: String
privatePerson: ContactInformation privatePerson: ContactInformation
organisation: Organisation organisation: Organisation
cargoBikes: [CargoBike] cargoBikes: [CargoBike!]
isLocked: Boolean! isLocked: Boolean!
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
@ -689,7 +698,7 @@ input ProviderCreateInput {
formName: String! formName: String!
privatePersonId: ID privatePersonId: ID
organisationId: ID organisationId: ID
cargoBikeIds: [ID] cargoBikeIds: [ID!]
} }
input ProviderUpdateInput { input ProviderUpdateInput {
@ -710,7 +719,7 @@ type Person {
id: ID! id: ID!
name: String! name: String!
firstName: String! firstName: String!
contactInformation: [ContactInformation] contactInformation: [ContactInformation!]
isLocked: Boolean! isLocked: Boolean!
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
@ -770,7 +779,7 @@ type Organisation {
name: String! name: String!
address: Address address: Address
"(dt. Ausleihstation)" "(dt. Ausleihstation)"
lendingStations: [LendingStation] lendingStations: [LendingStation!]
"registration number of association" "registration number of association"
associationNo: String associationNo: String
"If Club, at what court registered" "If Club, at what court registered"
@ -816,9 +825,9 @@ type LendingStation {
contactInformationIntern: ContactInformation contactInformationIntern: ContactInformation
contactInformationExtern: ContactInformation contactInformationExtern: ContactInformation
address: Address! address: Address!
timeFrames: [TimeFrame]! timeFrames: [TimeFrame!]!
loanPeriod: LoanPeriod loanPeriod: LoanPeriod
cargoBikes: [CargoBike] cargoBikes: [CargoBike!]
"Total amount of cargoBikes currently assigned to the lending station" "Total amount of cargoBikes currently assigned to the lending station"
numCargoBikes: Int! numCargoBikes: Int!
organisation: Organisation organisation: Organisation
@ -875,12 +884,12 @@ type LoanPeriod {
input LoanPeriodInput { input LoanPeriodInput {
generalRemark: String generalRemark: String
"notes for each day of the week, starting on Monday" "notes for each day of the week, starting on Monday"
notes: [String] notes: [String!]
""" """
Loan times from and until for each day of the week. Loan times from and until for each day of the week.
Starting with Monday from, Monday to, Tuesday from, ..., Sunday to Starting with Monday from, Monday to, Tuesday from, ..., Sunday to
""" """
loanTimes: [String] loanTimes: [String!]
} }
"(dt. Zeitscheibe) When was a bike where" "(dt. Zeitscheibe) When was a bike where"
@ -952,47 +961,47 @@ type Query {
"Will (eventually) return all properties of cargo bike" "Will (eventually) return all properties of cargo bike"
cargoBikeById(id:ID!): CargoBike cargoBikeById(id:ID!): CargoBike
"returns cargoBikes ordered by name ascending, relations are not loaded, use cargoBikeById instead" "returns cargoBikes ordered by name ascending, relations are not loaded, use cargoBikeById instead"
cargoBikes(offset: Int!, limit: Int!): [CargoBike]! cargoBikes(offset: Int!, limit: Int!): [CargoBike!]!
engagementById(id: ID!): Engagement engagementById(id: ID!): Engagement
engagements(offset: Int!, limit: Int!): [Engagement]! engagements(offset: Int!, limit: Int!): [Engagement!]!
engagementTypeById(id: ID!): EngagementType engagementTypeById(id: ID!): EngagementType
engagementTypes(offset: Int!, limit: Int!): [EngagementType]! engagementTypes(offset: Int!, limit: Int!): [EngagementType!]!
"equipment by id, will return null if id not found" "equipment by id, will return null if id not found"
equipmentById(id: ID!): Equipment equipmentById(id: ID!): Equipment
equipment(offset: Int!, limit: Int!): [Equipment]! equipment(offset: Int!, limit: Int!): [Equipment!]!
equipmentTypeById(id: ID!): EquipmentType equipmentTypeById(id: ID!): EquipmentType
equipmentTypes(offset: Int!, limit: Int!): [EquipmentType]! equipmentTypes(offset: Int!, limit: Int!): [EquipmentType!]!
"return null if id not found" "return null if id not found"
providerById(id:ID!): Provider providerById(id:ID!): Provider
"unique equipment with pagination, contains relation to bike (with no further joins), so if you wanna know more about the bike, use cargoBikeById" "Returns providers with pagination"
providers(offset: Int!, limit: Int!): [Provider]! providers(offset: Int!, limit: Int!): [Provider!]!
"participant by id" "participant by id"
participantById(id:ID!): Participant participantById(id:ID!): Participant
participants(offset: Int!, limit: Int!): [ Participant]! participants(offset: Int!, limit: Int!): [Participant!]!
workshopTypeById(id: ID!): WorkshopType workshopTypeById(id: ID!): WorkshopType
workshopTypes(offset: Int!, limit: Int!): [WorkshopType]! workshopTypes(offset: Int!, limit: Int!): [WorkshopType!]!
workshopById(id: ID!): Workshop workshopById(id: ID!): Workshop
workshops(offset: Int!, limit: Int!): [Workshop]! workshops(offset: Int!, limit: Int!): [Workshop!]!
lendingStationById(id:ID!): LendingStation lendingStationById(id:ID!): LendingStation
lendingStations(offset: Int!, limit: Int!): [LendingStation]! lendingStations(offset: Int!, limit: Int!): [LendingStation!]!
organisationById(id: ID!): Organisation organisationById(id: ID!): Organisation
organisations(offset: Int!, limit: Int!): [Organisation]! organisations(offset: Int!, limit: Int!): [Organisation!]!
timeFrameById(id: ID!): TimeFrame timeFrameById(id: ID!): TimeFrame
timeframes(offset: Int!, limit: Int!): [TimeFrame]! timeFrames(offset: Int!, limit: Int!): [TimeFrame!]!
contactInformationById(id: ID!): ContactInformation contactInformationById(id: ID!): ContactInformation
contactInformation(offset: Int!, limit: Int!): [ContactInformation]! contactInformation(offset: Int!, limit: Int!): [ContactInformation!]!
personById(id: ID!): Person personById(id: ID!): Person
persons(offset: Int!, limit: Int!): [Person] persons(offset: Int!, limit: Int!): [Person!]
bikeEventTypes(offset: Int!, limit: Int!): [BikeEventType] bikeEventTypes(offset: Int!, limit: Int!): [BikeEventType!]
bikeEventTypeByd(id: ID!): BikeEventType bikeEventTypeByd(id: ID!): BikeEventType
bikeEvents(offset: Int!, limit: Int!): [BikeEvent]! bikeEvents(offset: Int!, limit: Int!): [BikeEvent!]!
bikeEventById(id:ID!): BikeEvent bikeEventById(id:ID!): BikeEvent
"actionLog for current user" "actionLog for current user"
actionLog: [ActionLog] actionLog: [ActionLog!]
"actionLog for specific user" "actionLog for specific user"
actionLogByUser(id: ID!): [ActionLog] actionLogByUser(id: ID!): [ActionLog!]
"actionLog form all users" "actionLog form all users"
actionLogAll: [ActionLog] actionLogAll: [ActionLog!]
} }
type Mutation { type Mutation {

Write Preview
Loading…
Cancel
Save