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 #25 from fLotte-meets-HWR-DB/dev

Browse Source 
Dev
pull/26/head
leonnicolas 4 years ago committed by GitHub
parent eae48349c7 49bc8bdcfc
commit 144636eb50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 72 additions and 46 deletions
Show Stats Download Patch File Download Diff File

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

@ -44,10 +44,39 @@ export class LoanPeriod {
to: Date; to: Date;
@Column({ @Column({
type: 'simple-array',
nullable: true nullable: true
}) })
loanTimes: string[]; mo: string;
@Column({
nullable: true
})
tu: string;
@Column({
nullable: true
})
we: string;
@Column({
nullable: true
})
th: string;
@Column({
nullable: true
})
fr: string;
@Column({
nullable: true
})
sa: string;
@Column({
nullable: true
})
su: string;
} }
@Entity() @Entity()

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

@ -99,11 +99,6 @@ export default {
isLockedByMe: (parent: any, __: any, { req }: { req: any }) => isLockedByMe(parent, { req }), isLockedByMe: (parent: any, __: any, { req }: { req: any }) => isLockedByMe(parent, { req }),
isLocked: (parent: any, __: any, { req }: { req: any }) => isLocked(parent, { req }) isLocked: (parent: any, __: any, { req }: { req: any }) => isLocked(parent, { req })
}, },
LoanPeriod: {
loanTimes (parent: any) {
return parent.loanTimes ? parent.loanTimes : [];
}
},
DateRange: { DateRange: {
from (parent: string) { from (parent: string) {
return parent.replace(/^\[(.*),.*\)$/, '$1'); return parent.replace(/^\[(.*),.*\)$/, '$1');

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

@ -21,8 +21,10 @@ import { gql } from 'apollo-server-express';
export default gql` export default gql`
"timestamp object YYYY-MM-ddThh:mm:ss.sssZ" "date object YYYY-MM-dd"
scalar Date scalar Date
"timestamp object YYYY-MM-ddThh:mm:ss.sssZ"
scalar DateTime
"only time hh-mm-ss" "only time hh-mm-ss"
scalar Time scalar Time
""" """
@ -82,7 +84,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
""" """
@ -429,7 +431,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
input ParticipantCreateInput { input ParticipantCreateInput {
@ -482,7 +484,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
input WorkshopCreateInput { input WorkshopCreateInput {
@ -512,7 +514,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
input WorkshopTypeCreateInput { input WorkshopTypeCreateInput {
@ -532,7 +534,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
input EngagementTypeCreateInput { input EngagementTypeCreateInput {
@ -557,7 +559,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
input EngagementCreateInput { input EngagementCreateInput {
@ -609,7 +611,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
input EquipmentCreateInput { input EquipmentCreateInput {
@ -641,7 +643,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
input EquipmentTypeCreateInput { input EquipmentTypeCreateInput {
@ -674,7 +676,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
input BikeEventCreateInput { input BikeEventCreateInput {
@ -714,7 +716,7 @@ export default gql`
isLocked: Boolean! isLocked: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
input BikeEventTypeUpdateInput { input BikeEventTypeUpdateInput {
@ -734,7 +736,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
"(dt. Anbieter)" "(dt. Anbieter)"
@ -768,7 +770,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
input PersonCreateInput { input PersonCreateInput {
@ -795,7 +797,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
input ContactInformationCreateInput { input ContactInformationCreateInput {
@ -835,7 +837,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
input OrganisationCreateInput { input OrganisationCreateInput {
@ -879,7 +881,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
""" """
@ -913,13 +915,13 @@ export default gql`
""" """
type LoanPeriod { type LoanPeriod {
generalRemark: String generalRemark: String
"notes for each day of the week, starting on Monday" mo: String
notes: [String] tu: String
""" we: String
Loan times from and until for each day of the week. th: String
Starting with Monday from, Monday to, Tuesday from, ..., Sunday to fr: String
""" sa: String
loanTimes: [String] su: String
} }
""" """
@ -927,13 +929,13 @@ export default gql`
""" """
input LoanPeriodInput { input LoanPeriodInput {
generalRemark: String generalRemark: String
"notes for each day of the week, starting on Monday" mo: String
notes: [String!] tu: String
""" we: String
Loan times from and until for each day of the week. th: String
Starting with Monday from, Monday to, Tuesday from, ..., Sunday to fr: String
""" sa: String
loanTimes: [String!] su: String
} }
type DateRange{ type DateRange{
@ -963,7 +965,7 @@ export default gql`
isLockedByMe: Boolean! isLockedByMe: Boolean!
"null if not locked by other user" "null if not locked by other user"
lockedBy: ID lockedBy: ID
lockedUntil: Date lockedUntil: DateTime
} }
input TimeFrameCreateInput { input TimeFrameCreateInput {
@ -1138,23 +1140,23 @@ export default gql`
""" """
createParticipant(participant: ParticipantCreateInput!): Participant! createParticipant(participant: ParticipantCreateInput!): Participant!
lockParticipant(id: ID!): Participant! lockParticipant(id: ID!): Participant!
unlockParticipant(id: ID!): Boolean unlockParticipant(id: ID!): Participant
updateParticipant(participant: ParticipantUpdateInput!): Participant! updateParticipant(participant: ParticipantUpdateInput!): Participant!
deleteParticipant(id: ID!): Boolean! deleteParticipant(id: ID!): Boolean!
createWorkshopType(workshopType: WorkshopTypeCreateInput!): WorkshopType! createWorkshopType(workshopType: WorkshopTypeCreateInput!): WorkshopType!
lockWorkshopType(id: ID!): WorkshopType! lockWorkshopType(id: ID!): WorkshopType!
unlockWorkshopType(id: ID!): Boolean! unlockWorkshopType(id: ID!): WorkshopType!
updateWorkshopType(workshopType: WorkshopTypeUpdateInput!): WorkshopType! updateWorkshopType(workshopType: WorkshopTypeUpdateInput!): WorkshopType!
deleteWorkshopType(id: ID!): Boolean! deleteWorkshopType(id: ID!): Boolean!
createWorkshop(workshop: WorkshopCreateInput!): Workshop! createWorkshop(workshop: WorkshopCreateInput!): Workshop!
lockWorkshop(id: ID!): Workshop! lockWorkshop(id: ID!): Workshop!
unlockWorkshop(id: ID!): Boolean! unlockWorkshop(id: ID!): Workshop!
updateWorkshop(workshop: WorkshopUpdateInput!): Workshop! updateWorkshop(workshop: WorkshopUpdateInput!): Workshop!
deleteWorkshop(id: ID!): Boolean! deleteWorkshop(id: ID!): Boolean!
"create new contactInfo" "create new contactInfo"
createContactInformation(contactInformation: ContactInformationCreateInput!): ContactInformation! createContactInformation(contactInformation: ContactInformationCreateInput!): ContactInformation!
lockContactInformation(id: ID!): ContactInformation! lockContactInformation(id: ID!): ContactInformation!
unlockContactInformation(id: ID!): Boolean! unlockContactInformation(id: ID!): ContactInformation!
updateContactInformation(contactInformation: ContactInformationUpdateInput!): ContactInformation! updateContactInformation(contactInformation: ContactInformationUpdateInput!): ContactInformation!
deleteContactInformation(id: ID!): Boolean! deleteContactInformation(id: ID!): Boolean!
createPerson(person: PersonCreateInput!): Person! createPerson(person: PersonCreateInput!): Person!
@ -1165,22 +1167,22 @@ export default gql`
"create Engagement" "create Engagement"
createEngagement(engagement: EngagementCreateInput): Engagement! createEngagement(engagement: EngagementCreateInput): Engagement!
lockEngagement(id: ID!): Engagement! lockEngagement(id: ID!): Engagement!
unlockEngagement(id: ID!): Boolean! unlockEngagement(id: ID!): Engagement!
updateEngagement(engagement: EngagementUpdateInput!): Engagement! updateEngagement(engagement: EngagementUpdateInput!): Engagement!
deleteEngagement(id: ID!): Boolean! deleteEngagement(id: ID!): Boolean!
createEngagementType(engagementType: EngagementTypeCreateInput!): EngagementType! createEngagementType(engagementType: EngagementTypeCreateInput!): EngagementType!
lockEngagementType(id: ID!): EngagementType! lockEngagementType(id: ID!): EngagementType!
unlockEngagementType(id: ID!): Boolean! unlockEngagementType(id: ID!): EngagementType!
updateEngagementType(engagementType: EngagementTypeUpdateInput!): EngagementType! updateEngagementType(engagementType: EngagementTypeUpdateInput!): EngagementType!
deleteEngagementType(id: ID!): Boolean! deleteEngagementType(id: ID!): Boolean!
createProvider(provider: ProviderCreateInput!): Provider! createProvider(provider: ProviderCreateInput!): Provider!
lockProvider(id: ID!): Provider! lockProvider(id: ID!): Provider!
unlockProvider(id: ID!): Boolean! unlockProvider(id: ID!): Provider!
updateProvider(provider: ProviderUpdateInput!): Provider! updateProvider(provider: ProviderUpdateInput!): Provider!
deleteProvider(id: ID!): Boolean! deleteProvider(id: ID!): Boolean!
createOrganisation(organisation: OrganisationCreateInput!): Organisation! createOrganisation(organisation: OrganisationCreateInput!): Organisation!
lockOrganisation(id: ID!): Organisation! lockOrganisation(id: ID!): Organisation!
unlockOrganisation(id: ID!): Boolean! unlockOrganisation(id: ID!): Organisation!
updateOrganisation(organisation: OrganisationUpdateInput!): Organisation! updateOrganisation(organisation: OrganisationUpdateInput!): Organisation!
deleteOrganisation(id: ID!): Boolean! deleteOrganisation(id: ID!): Boolean!
} }

Write Preview
Loading…
Cancel
Save