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

corrected some typos

Browse Source
pull/14/head
leonnicolas 4 years ago
parent e1e2302a1a
commit b3877664b9
No known key found for this signature in database
GPG Key ID: 088D0743E2B65C07
7 changed files with 50 additions and 57 deletions
Show Stats Download Patch File Download Diff File

4
src/index.ts
Unescape Escape View File

@ -15,7 +15,7 @@ import { Equipment } from './model/Equipment';
import { LendingStation } from './model/LendingStation';
import { TimeFrame } from './model/TimeFrame';
import { Participant } from './model/Participant';
import { Organization } from './model/Organization';
import { Organisation } from './model/Organisation';
import { Provider } from './model/Provider';
import { Engagement } from './model/Engagement';
import { Workshop } from './model/Workshop';
@ -69,7 +69,7 @@ createConnection({
Equipment,
LendingStation,
TimeFrame,
Organization,
Organisation,
Participant,
Provider,
Engagement,

2
src/model/Engagement.ts
Unescape Escape View File

@ -32,7 +32,7 @@ export class Engagement {
roleCoordinator: boolean;
@Column()
roleEmployeADFC: boolean;
roleEmployeeADFC: boolean;
@Column()
roleMentor: boolean;

6
src/model/InsuranceData.ts
Unescape Escape View File

@ -14,15 +14,15 @@ export class InsuranceData {
noPnP: string;
@Column()
maintananceResponsible: string;
maintenanceResponsible: string;
@Column()
maintananceBenefactor: string;
maintenanceBenefactor: string;
@Column({
nullable: true
})
maintananceAgreement: string;
maintenanceAgreement: string;
@Column({
nullable: true

6
src/model/LendingStation.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { Entity, PrimaryGeneratedColumn, Column, ManyToMany, JoinTable, OneToMany, ManyToOne } from 'typeorm';
import { TimeFrame } from './TimeFrame';
import { CargoBike } from './CargoBike';
import { Organization } from './Organization';
import { Organisation } from './Organisation';
import { Address } from './Provider';
import { ContactPerson } from './ContactPerson';
@ -46,6 +46,6 @@ export class LendingStation {
})
cargoBikes: CargoBike[];
@ManyToOne(type => Organization, organization => organization.lendingStations)
organization: Organization;
@ManyToOne(type => Organisation, organization => organization.lendingStations)
organization: Organisation;
}

4
src/model/Organization.ts → src/model/Organisation.ts
Unescape Escape View File

@ -3,7 +3,7 @@ import { LendingStation } from './LendingStation';
import { Address, Provider } from './Provider';
@Entity()
export class Organization {
export class Organisation {
@PrimaryGeneratedColumn()
id: number;
@ -19,7 +19,7 @@ export class Organization {
@Column({
nullable: true
})
registerdAt: string;
registeredAt: string;
@Column({
nullable: true

8
src/model/Provider.ts
Unescape Escape View File

@ -5,7 +5,7 @@ import { CargoBike } from './CargoBike';
import { ContactInformation } from './ContactInformation';
import { ContactPerson } from './ContactPerson';
import { LendingStation } from './LendingStation';
import { Organization } from './Organization';
import { Organisation } from './Organisation';
export class Address {
@Column()
@ -31,7 +31,7 @@ export class Provider {
@Column({
nullable: false
})
formularName: String;
formName: String;
@OneToMany(type => ContactPerson, contactPerson => contactPerson.provider, {
nullable: true
@ -44,8 +44,8 @@ export class Provider {
@Column()
isPrivatePerson: boolean;
@OneToOne(type => Organization, organization => organization.provider, {
@OneToOne(type => Organisation, organization => organization.provider, {
nullable: true
})
organization: Organization;
organization: Organisation;
}

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

@ -20,15 +20,15 @@ type CargoBike {
numberOfChildren: Int!
"""
Safety is a custom type, that stores information about security features.
TODO: Should this be calles Security?
TODO: Should this be called Security?
"""
security: Security!
"""
Does not refere to an extra table in the database.
Does not refer to an extra table in the database.
"""
technicalEquipment: TechnicalEquipment
"""
Does not refere to an extra table in the database.
Does not refer to an extra table in the database.
"""
dimensionsAndLoad: DimensionsAndLoad!
bikeEvents: [BikeEvent]
@ -62,15 +62,15 @@ input CargoBikeCreateInput {
numberOfChildren: Int!
"""
Safety is a custom type, that stores information about security features.
TODO: Should this be calles Security?
TODO: Should this be called Security?
"""
security: SecurityCreateInput!
"""
Does not refere to an extra table in the database.
Does not refer to an extra table in the database.
"""
technicalEquipment: TechnicalEquipmentCreateInput!
"""
Does not refere to an extra table in the database.
Does not refer to an extra table in the database.
"""
dimensionsAndLoad: DimensionsAndLoadCreateInput!
"Refers to equipment that is not unique. See kommentierte info tabelle -> Fragen -> Frage 2"
@ -97,15 +97,15 @@ input CargoBikeUpdateInput {
numberOfChildren: Int
"""
Safety is a custom type, that stores information about security features.
TODO: Should this be calles Security?
TODO: Should this be called Security?
"""
security: SecurityUpdateInput
"""
Does not refere to an extra table in the database.
Does not refer to an extra table in the database.
"""
technicalEquipment: TechnicalEquipmentUpdateInput
"""
Does not refere to an extra table in the database.
Does not refer to an extra table in the database.
"""
dimensionsAndLoad: DimensionsAndLoadUpdateInput
"Refers to equipment that is not unique. See kommentierte info tabelle -> Fragen -> Frage 2"
@ -123,16 +123,16 @@ input CargoBikeUpdateInput {
type InsuranceData {
"""
Eventuelly, this field will become an enum or a seperate data table and user can choose from a pool of insurance companies.
Eventuelly, this field will become an enum or a separate data table and user can choose from a pool of insurance companies.
"""
name: String!
benefactor: String!
billing: String!
noPnP: String!
"eg. Anbieter, flotte, eigenleistung"
maintananceResponsible: String!
maintananceBenefactor: String!
maintananceAgreement: String
maintenanceResponsible: String!
maintenanceBenefactor: String!
maintenanceAgreement: String
hasFixedRate: Boolean!
fixedRate: Float
"Projektzuschuss"
@ -142,16 +142,16 @@ type InsuranceData {
input InsuranceDataCreateInput {
"""
Eventuelly, this field will become an enum or a seperate data table and user can choose from a pool of insurance companies.
Eventually, this field will become an enum or a separate data table and user can choose from a pool of insurance companies.
"""
name: String!
benefactor: String!
billing: String!
noPnP: String!
"eg. Anbieter, flotte, eigenleistung"
maintananceResponsible: String!
maintananceBenefactor: String!
maintananceAgreement: String
maintenanceResponsible: String!
maintenanceBenefactor: String!
maintenanceAgreement: String
hasFixedRate: Boolean!
fixedRate: Float
"Projektzuschuss"
@ -161,16 +161,16 @@ input InsuranceDataCreateInput {
input InsuranceDataUpdateInput {
"""
Eventuelly, this field will become an enum or a seperate data table and user can choose from a pool of insurance companies.
Eventually, this field will become an enum or a separate data table and user can choose from a pool of insurance companies.
"""
name: String
benefactor: String
billing: String
noPnP: String
"eg. Anbieter, flotte, eigenleistung"
maintananceResponsible: String
maintananceBenefactor: String
maintananceAgreement: String
maintenanceResponsible: String
maintenanceBenefactor: String
maintenanceAgreement: String
hasFixedRate: Boolean
fixedRate: Float
"Projektzuschuss"
@ -211,14 +211,7 @@ type Participant {
memberADFC: Boolean!
locationZIPs: [String]
memberCoreTeam: Boolean!
roleCoordinator: Boolean!
roleEmployeADFC: Boolean!
"""
Wahr, wenn die Person Pate ist.
"""
roleMentor: Boolean!
roleAmbulance: Boolean!
roleBringer: Boolean!
"Date of workshop to become Mentor dt. Pate"
workshopMentor: Date
"Date of last Erste Hilfe Kurs?"
@ -261,7 +254,7 @@ type Engagement {
participant: Participant
cargoBike: CargoBike
roleCoordinator: Boolean!
roleEmployeADFC: Boolean!
roleEmployeeADFC: Boolean!
"""
Wahr, wenn die Person Pate ist.
"""
@ -276,7 +269,7 @@ input EngagementCreateInput {
participantId: ID!
cargoBikeId: ID!
roleCoordinator: Boolean!
roleEmployeADFC: Boolean!
roleEmployeeADFC: Boolean!
"""
Wahr, wenn die Person Pate ist.
"""
@ -506,10 +499,10 @@ enum StickerBikeNameState {
UNKNOWN
}
"(dt. Anbieter) bezieht sich auf die Benziehung einer Person oder Organisation zum Lastenrad"
"(dt. Anbieter) bezieht sich auf die Beziehung einer Person oder Organisation zum Lastenrad"
type Provider {
id: ID!
formularName: String
formName: String
contactPersons: [ContactInformation]!
isPrivatePerson: Boolean!
organisation: Organisation
@ -518,7 +511,7 @@ type Provider {
"(dt. Anbieter)"
input ProviderCreateInput {
formularName: String!
formName: String!
"i think it makes more sense to create Provider and then add new ContactPersons"
contactPersonIds: [ID]!
isPrivatePerson: Boolean!
@ -595,7 +588,7 @@ type Organisation {
"If Club, at what court registered"
registeredAt: String
provider: Provider
otherdata: String
otherData: String
}
"(dt. Standort)"
@ -607,7 +600,7 @@ type LendingStation {
timeFrames: [TimeFrame]!
loanPeriods: LoanPeriods
cargoBikes: [CargoBike]
"Totola Amount of cargoBikes currently assigned to the lending station"
"Total amount of cargoBikes currently assigned to the lending station"
numCargoBikes: Int!
}
@ -662,7 +655,7 @@ type TimeFrame {
id: ID!
"format YYYY-MM-dd"
from: Date!
"formmat YYYY-MM-dd"
"format YYYY-MM-dd"
to: Date
note: String
lendingStation: LendingStation!
@ -706,7 +699,7 @@ input AddressUpdateInput {
}
type Query {
"Will (evetually) return all properties of cargo bike"
"Will (eventually) return all properties of cargo bike"
cargoBikeById(id:ID!): CargoBike
"returns cargoBikes ordered by name ascending, relations are not loaded, use cargoBikeById instead"
cargoBikes(offset: Int!, limit: Int!): [CargoBike]!
@ -717,7 +710,7 @@ type Query {
"equipment by id, will return null if id not found"
equipmentById(id: ID!): Equipment
providers(offset: Int!, limit: Int!): [Provider]!
"particcipant by id"
"participant by id"
participantById(id:ID!): Participant
"p"
participants(offset: Int!, limit: Int!): [ Participant]!
@ -742,14 +735,14 @@ type Mutation {
createEquipment(equipment: EquipmentCreateInput!): Equipment!
"lock equipment returns true if bike is not locked or if it doesnt exist"
lockEquipmentById(id: ID!): Equipment!
"unlock Equopment, returns true if Bike does not exist"
"unlock Equipment, returns true if Bike does not exist"
unlockEquipment(id: ID!): Boolean!
"update Equipment, returns updated equipment. CargoBike will be null, if cargoBikeId is not set. Pass null for cargoBikeIs to delete the relation"
updateEquipment(equipment: EquipmentUpdateInput!): Equipment!
"creates new lendingStation and returns lendingStation with new ID"
createLendingStation(lendingStation: LendingStationCreateInput): LendingStation!
"updates lendingStation of given ID with supplied fields and returns updated lendingStation"
updateLendingStation(lendingstation: LendingStationUpdateInput!): LendingStation!
updateLendingStation(lendingStation: LendingStationUpdateInput!): LendingStation!
createTimeFrame(timeFrame: TimeFrameCreateInput!): TimeFrame!
"creates new BikeEvent"
createBikeEvent(bikeEvent: BikeEventCreateInput): BikeEvent!
@ -759,7 +752,7 @@ type Mutation {
createContactInformation(contactInformation: ContactInformationCreateInput!): ContactInformation!
"create Engagement"
createEngagement(engagement: EngagementCreateInput): Engagement!
"createContacPerson ,return null if contactInformationId does not exist"
"createContactPerson ,return null if contactInformationId does not exist"
createContactPerson(contactPerson: ContactPersonCreateInput): ContactPerson
updateContactPerson(contactPerson: ContactPersonUpdateInput): ContactPerson
"create Provider, if cargoBikeIds or contactPersonIds are not valid, provider will still be created"

Write Preview
Loading…
Cancel
Save