From 2c8a5ea6b7b6c87563abcb77228ddfa52f5e18d3 Mon Sep 17 00:00:00 2001 From: leonnicolas Date: Fri, 27 Nov 2020 10:39:33 +0100 Subject: [PATCH] src/model + src/schema: removed mandatory fields --- src/model/CargoBike.ts | 20 +++++++--- src/model/ContactInformation.ts | 4 +- src/model/InsuranceData.ts | 24 +++++++++--- src/model/Taxes.ts | 4 +- src/schema/type-defs.ts | 66 ++++++++++++++++----------------- 5 files changed, 70 insertions(+), 48 deletions(-) diff --git a/src/model/CargoBike.ts b/src/model/CargoBike.ts index 10b2d78..cbd1073 100644 --- a/src/model/CargoBike.ts +++ b/src/model/CargoBike.ts @@ -90,13 +90,19 @@ export class Security { adfcCoding: string; } export class TechnicalEquipment { - @Column() + @Column({ + nullable: true + }) bicycleShift: string; - @Column() + @Column({ + nullable: true + }) isEBike: boolean; - @Column() + @Column({ + nullable: true + }) hasLightSystem: boolean; @Column({ @@ -106,10 +112,14 @@ export class TechnicalEquipment { } export class DimensionsAndLoad { - @Column() + @Column({ + nullable: true + }) hasCoverBox: boolean; - @Column() + @Column({ + nullable: true + }) lockable:boolean; @Column({ diff --git a/src/model/ContactInformation.ts b/src/model/ContactInformation.ts index 0e80f27..64e17aa 100644 --- a/src/model/ContactInformation.ts +++ b/src/model/ContactInformation.ts @@ -42,9 +42,7 @@ export class ContactInformation implements Lockable { }) participantId: number; - @Column(type => { - return Address; - }) + @Column(type => { return Address; }) address: Address; @Column({ diff --git a/src/model/InsuranceData.ts b/src/model/InsuranceData.ts index ef7c0fd..27fe256 100644 --- a/src/model/InsuranceData.ts +++ b/src/model/InsuranceData.ts @@ -20,22 +20,34 @@ This file is part of fLotte-API-Server. import { Column } from 'typeorm'; export class InsuranceData { - @Column() + @Column({ + nullable: true + }) name: string; - @Column() + @Column({ + nullable: true + }) benefactor: string; - @Column() + @Column({ + nullable: true + }) billing: string; - @Column() + @Column({ + nullable: true + }) noPnP: string; - @Column() + @Column({ + nullable: true + }) maintenanceResponsible: string; - @Column() + @Column({ + nullable: true + }) maintenanceBenefactor: string; @Column({ diff --git a/src/model/Taxes.ts b/src/model/Taxes.ts index 3c0f033..449cf27 100644 --- a/src/model/Taxes.ts +++ b/src/model/Taxes.ts @@ -25,7 +25,9 @@ export enum OrganisationArea { ZB = 'ZB' } export class Taxes { - @Column() + @Column({ + nullable: true + }) costCenter: string; @Column({ diff --git a/src/schema/type-defs.ts b/src/schema/type-defs.ts index d92729d..557f3f8 100644 --- a/src/schema/type-defs.ts +++ b/src/schema/type-defs.ts @@ -56,7 +56,7 @@ export default gql` """ Does not refer to an extra table in the database. """ - dimensionsAndLoad: DimensionsAndLoad! + dimensionsAndLoad: DimensionsAndLoad "If offset or limit is not provided, both values are ignored" bikeEvents(offset: Int, limit: Int): [BikeEvent] "If offset or limit is not provided, both values are ignored" @@ -69,7 +69,7 @@ export default gql` provider: Provider "all participants currently engaged with the cargoBike" participants: [Participant] - insuranceData: InsuranceData! + insuranceData: InsuranceData lendingStation: LendingStation taxes: Taxes currentEngagements: [Engagement] @@ -102,11 +102,11 @@ export default gql` """ Does not refer to an extra table in the database. """ - technicalEquipment: TechnicalEquipmentCreateInput! + technicalEquipment: TechnicalEquipmentCreateInput """ Does not refer to an extra table in the database. """ - dimensionsAndLoad: DimensionsAndLoadCreateInput! + dimensionsAndLoad: DimensionsAndLoadCreateInput """ Refers to equipment that is not unique. See kommentierte info tabelle -> Fragen -> Frage 2 When set to null or [], no relations will be added. @@ -122,8 +122,8 @@ export default gql` stickerBikeNameState: StickerBikeNameState note: String providerId: ID - insuranceData: InsuranceDataCreateInput! - taxes: TaxesCreateInput! + insuranceData: InsuranceDataCreateInput + taxes: TaxesCreateInput } """ @@ -180,15 +180,15 @@ export default gql` """ 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! + name: String + benefactor: String + billing: String + noPnP: String "eg. Anbieter, flotte, eigenleistung" - maintenanceResponsible: String! - maintenanceBenefactor: String! + maintenanceResponsible: String + maintenanceBenefactor: String maintenanceAgreement: String - hasFixedRate: Boolean! + hasFixedRate: Boolean fixedRate: Float """ Projektzuschuss: @@ -206,15 +206,15 @@ export default gql` """ 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! + name: String + benefactor: String + billing: String + noPnP: String "eg. Anbieter, flotte, eigenleistung" - maintenanceResponsible: String! - maintenanceBenefactor: String! + maintenanceResponsible: String + maintenanceBenefactor: String maintenanceAgreement: String - hasFixedRate: Boolean! + hasFixedRate: Boolean fixedRate: Float """ Projektzuschuss: @@ -256,9 +256,9 @@ export default gql` "How are the dimensions and how much weight can handle a bike. This data is merged in the CargoBike table and the BikeModel table." type DimensionsAndLoad { - hasCoverBox: Boolean! + hasCoverBox: Boolean "cover box can be locked" - lockable: Boolean! + lockable: Boolean minBoxLength: Float maxBoxLength: Float minBoxWidth: Float @@ -275,8 +275,8 @@ export default gql` } input DimensionsAndLoadCreateInput { - hasCoverBox: Boolean! - lockable: Boolean! + hasCoverBox: Boolean + lockable: Boolean minBoxLength: Float maxBoxLength: Float minBoxWidth: Float @@ -316,16 +316,16 @@ export default gql` So no id needed for mutation. One Mutation for the CargoBike will be enough. """ type TechnicalEquipment { - bicycleShift: String! - isEBike: Boolean! - hasLightSystem: Boolean! + bicycleShift: String + isEBike: Boolean + hasLightSystem: Boolean specialFeatures: String } input TechnicalEquipmentCreateInput { - bicycleShift: String! - isEBike: Boolean! - hasLightSystem: Boolean! + bicycleShift: String + isEBike: Boolean + hasLightSystem: Boolean specialFeatures: String } @@ -563,12 +563,12 @@ export default gql` } type Taxes { - costCenter: String! + costCenter: String organisationArea: OrganisationArea } input TaxesCreateInput { - costCenter: String! + costCenter: String organisationArea: OrganisationArea } @@ -643,7 +643,7 @@ export default gql` keepLock: Boolean } - "An Event is a point in time, when the state of the bike somehow changed." + "An Event is a point in time concerning one cargo bike of an event type. For example a chain swap." type BikeEvent { id: ID! bikeEventType: BikeEventType!