bikeevent, bikeeventype read and create

src/datasources/db/cargobikeAPI.ts

@@ -9,6 +9,7 @@ import { Provider } from '../../model/Provider';
 import { TimeFrame } from '../../model/TimeFrame';
 import { LockUtils } from './utils';
 import { EquipmentType } from '../../model/EquipmentType';
+import { BikeEventType } from '../../model/BikeEventType';
 
 /**
  * extended datasource to feed resolvers with data about cargoBikes
@@ -158,13 +159,62 @@ export class CargoBikeAPI extends DataSource {
     }
 
     async createBikeEvent ({ bikeEvent }: { bikeEvent: any }) {
-        const event = new BikeEvent();
+        return (await this.connection.getRepository(BikeEvent)
-        event.setValues(bikeEvent);
+            .createQueryBuilder('be')
-        event.cargoBike = await this.findCargoBikeById(bikeEvent.cargoBikeId) as unknown as CargoBike;
+            .insert()
-        if (event.cargoBike instanceof GraphQLError) {
+            .values([bikeEvent])
-            return event.cargoBike;
+            .returning('*')
+            .execute()).generatedMaps[0];
+    }
+
+    async cargoBikeByEventId (id: number) {
+        return await this.connection.getRepository(BikeEvent)
+            .createQueryBuilder('be')
+            .relation(BikeEvent, 'cargoBikeId')
+            .of(id)
+            .loadOne();
     }
-        return await this.connection.manager.save(event);
+
+    async bikeEventTypeByBikeEventId (id: number) {
+        return await this.connection.getRepository(BikeEvent)
+            .createQueryBuilder('be')
+            .relation(BikeEvent, 'bikeEventTypeId')
+            .of(id)
+            .loadOne();
+    }
+
+    async createBikeEventType (bikeEventType: any) {
+        return (await this.connection.getRepository(BikeEventType)
+            .createQueryBuilder('bet')
+            .insert()
+            .values([{ name: bikeEventType }])
+            .returning('*')
+            .execute())?.generatedMaps[0];
+    }
+
+    async bikeEventTypes (offset: number, limit: number) {
+        return await this.connection.getRepository(BikeEventType)
+            .createQueryBuilder('bet')
+            .select()
+            .skip(offset)
+            .take(limit)
+            .getMany();
+    }
+
+    async responsibleByBikeEventId (id: number) {
+        return await this.connection.getRepository(BikeEvent)
+            .createQueryBuilder('be')
+            .relation(BikeEvent, 'responsibleId')
+            .of(id)
+            .loadOne();
+    }
+
+    async relatedByBikeEventId (id: number) {
+        return await this.connection.getRepository(BikeEvent)
+            .createQueryBuilder('be')
+            .relation(BikeEvent, 'relatedId')
+            .of(id)
+            .loadOne();
     }
 
     /**

src/datasources/db/providerAPI.ts

@@ -2,6 +2,7 @@ import { DataSource } from 'apollo-datasource';
 import { Connection, EntityManager, getConnection } from 'typeorm';
 import { Provider } from '../../model/Provider';
 import { Organisation } from '../../model/Organisation';
+import { UserInputError } from 'apollo-server';
 
 export class ProviderAPI extends DataSource {
     connection : Connection
@@ -51,7 +52,16 @@ export class ProviderAPI extends DataSource {
             .loadOne();
     }
 
+    async privatePersonByProviderId (id: number) {
+        return await this.connection.getRepository(Provider)
+            .createQueryBuilder('p')
+            .relation(Provider, 'privatePersonId')
+            .of(id)
+            .loadOne();
+    }
+
     async createProvider (provider: any) {
+        if (!provider.privatePersonId === !provider.organisationId) { return new UserInputError('Provider must have either privatePersonId or organisationId'); }
         let inserts: any = null;
         await this.connection.transaction(async (entityManager: any) => {
             inserts = await entityManager.getRepository(Provider)

src/datasources/userserver/permission.ts

@@ -6,7 +6,8 @@ export enum Permission {
     WritePerson = 'PERSON_WRITE',
     ReadPerson = 'PERSON_READ',
     WriteProvider = 'PROVIDER_WRITE',
-    WriteWorkshopType = 'WORKSHOP_TYPE_WRITE'
+    WriteWorkshopType = 'WORKSHOP_TYPE_WRITE',
+WriteEventType = 'BIKE_EVENT_TYPE_WRITE'
 }
 
 // Permissions where the creation will be requested on startup
@@ -38,5 +39,9 @@ export const requiredPermissions = [
     {
         name: Permission.WriteWorkshopType,
         description: 'Allows to create and modify workshop types'
+    },
+    {
+        name: Permission.WriteEventType,
+        description: 'Allows modification of bike event types'
     }
 ];

src/model/BikeEvent.ts

@@ -7,14 +7,6 @@ import { type } from 'os';
 
 @Entity()
 export class BikeEvent {
-    public setValues ({ id, remark, date, documents, cargoBike }: { id: number, remark: string, date: Date, documents: string[], cargoBike: CargoBike}): void {
-        this.id = id;
-        this.remark = remark;
-        this.date = date;
-        this.documents = documents;
-        this.cargoBike = cargoBike;
-    }
-
     @PrimaryGeneratedColumn()
     id: number;
 
@@ -38,22 +30,35 @@ export class BikeEvent {
     date: Date;
 
     @ManyToOne(type => Participant)
-    responsible: Participant;
+    @JoinColumn({
+        name: 'responsibleId'
+    })
+    responsibleId: number;
 
     @ManyToOne(type => Participant)
-    related: Participant;
+    @JoinColumn({
+        name: 'relatedId'
+    })
+    relatedId: number;
 
     @Column('simple-array', {
         nullable: true
     })
     documents: string[];
 
-    @ManyToOne(tpye => CargoBike, cargoBike => cargoBike.bikeEvents, {
+    @ManyToOne(type => CargoBike, cargoBike => cargoBike.bikeEvents, {
         nullable: false
     })
-    @JoinColumn({ name: 'cargoBikeId' })
+    @JoinColumn({
-    cargoBike: CargoBike;
+        name: 'cargoBikeId'
+    })
+    cargoBikeId: number;
 
-    @ManyToOne(type => BikeEventType)
+    @ManyToOne(type => BikeEventType, {
-    bikeEventType: BikeEventType;
+        nullable: false
+    })
+    @JoinColumn({
+        name: 'bikeEventTypeId'
+    })
+    bikeEventTypeId: number;
 }

src/model/BikeEventType.ts

@@ -6,7 +6,9 @@ export class BikeEventType implements Lockable {
     @PrimaryGeneratedColumn()
     id: number;
 
-    @Column()
+    @Column({
+        unique: true
+    })
     name: string;
 
     @Column({

src/model/CargoBike.ts

@@ -186,7 +186,7 @@ export class CargoBike implements Lockable {
     })
     provider: Provider;
 
-    @OneToMany(type => BikeEvent, bikeEvent => bikeEvent.cargoBike, {
+    @OneToMany(type => BikeEvent, bikeEvent => bikeEvent.cargoBikeId, {
         nullable: true,
         cascade: true
     })

src/model/Provider.ts

@@ -41,8 +41,10 @@ export class Provider implements Lockable {
     @OneToOne(type => ContactInformation, {
         nullable: true
     })
-    @JoinColumn()
+    @JoinColumn({
-    contactInformationId: number;
+        name: 'privatePersonId'
+    })
+    privatePersonId: number;
 
     // is null when Provider is a private Person
     @OneToOne(type => Organisation, organization => organization.providerId, {

src/resolvers/cargobikeResolver.ts

@@ -37,6 +37,13 @@ export default {
             } else {
                 return new GraphQLError('Insufficiant Permissions');
             }
+        },
+        bikeEventTypes: (_:any, { offset, limit }: { offset: number, limit: number }, { dataSources, req }: { dataSources: any, req: any }) => {
+            if (req.permissions.includes(Permission.ReadBike)) {
+                return dataSources.cargoBikeAPI.bikeEventTypes(offset, limit);
+            } else {
+                return new GraphQLError('Insufficiant Permissions');
+            }
         }
     },
     CargoBike: {
@@ -71,29 +78,43 @@ export default {
             return dataSources.cargoBikeAPI.cargoBikeByEquipmentId(parent.id);
         }
     },
+    BikeEvent: {
+        cargoBike (parent: any, __: any, { dataSources, req }: { dataSources: any, req: any }) {
+            return dataSources.cargoBikeAPI.cargoBikeByEventId(parent.id);
+        },
+        bikeEventType (parent: any, __: any, { dataSources, req }: { dataSources: any, req: any }) {
+            return dataSources.cargoBikeAPI.bikeEventTypeByBikeEventId(parent.id);
+        },
+        responsible (parent: any, __: any, { dataSources, req }: { dataSources: any, req: any }) {
+            return dataSources.cargoBikeAPI.responsibleByBikeEventId(parent.id);
+        },
+        related (parent: any, __: any, { dataSources, req }: { dataSources: any, req: any }) {
+            return dataSources.cargoBikeAPI.relatedByBikeEventId(parent.id);
+        }
+    },
     Mutation: {
-        createCargoBike: (_: any, { cargoBike }: { cargoBike: any }, { dataSources, req }:{dataSources: any, req: any }) => {
+        createCargoBike: (_: any, { cargoBike }: { cargoBike: any }, { dataSources, req }: { dataSources: any, req: any }) => {
             if (req.permissions.includes(Permission.WriteBike)) {
                 return dataSources.cargoBikeAPI.createCargoBike({ cargoBike });
             } else {
                 return new GraphQLError('Insufficient Permissions');
             }
         },
-        lockCargoBikeById: (_: any, { id }: { id: number }, { dataSources, req }:{dataSources: any, req: any }) => {
+        lockCargoBikeById: (_: any, { id }: { id: number }, { dataSources, req }: { dataSources: any, req: any }) => {
             if (req.permissions.includes(Permission.WriteBike)) {
                 return dataSources.cargoBikeAPI.lockCargoBike(id, req, dataSources);
             } else {
                 return new GraphQLError('Insufficient Permissions');
             }
         },
-        unlockCargoBikeById: (_: any, { id }: { id: number }, { dataSources, req }:{dataSources: any, req: any }) => {
+        unlockCargoBikeById: (_: any, { id }: { id: number }, { dataSources, req }: { dataSources: any, req: any }) => {
             if (req.permissions.includes(Permission.WriteBike)) {
                 return dataSources.cargoBikeAPI.unlockCargoBike(id, req, dataSources);
             } else {
                 return new GraphQLError('Insufficient Permissions');
             }
         },
-        updateCargoBike: (_: any, { cargoBike }: { cargoBike: any }, { dataSources, req }:{dataSources: any, req: any }) => {
+        updateCargoBike: (_: any, { cargoBike }: { cargoBike: any }, { dataSources, req }: { dataSources: any, req: any }) => {
             if (req.permissions.includes(Permission.WriteBike)) {
                 return dataSources.cargoBikeAPI.updateCargoBike(cargoBike, req, dataSources);
             } else {
@@ -141,6 +162,13 @@ export default {
             } else {
                 return new GraphQLError('Insufficient Permissions');
             }
+        },
+        createBikeEventType: (_: any, { name }: { name: any }, { dataSources, req }: { dataSources: any, req: any }) => {
+            if (req.permissions.includes(Permission.WriteEventType)) {
+                return dataSources.cargoBikeAPI.createBikeEventType(name);
+            } else {
+                return new GraphQLError('Insufficient Permissions');
+            }
         }
     }
 };

src/resolvers/providerResolvers.ts

@@ -28,6 +28,9 @@ export default {
         },
         organisation: (parent: any, __: any, { dataSources, req }: { dataSources: any, req: any }) => {
             return dataSources.providerAPI.organisationByProviderId(parent.id);
+        },
+        privatePerson: (parent: any, __: any, { dataSources, req }: { dataSources: any, req: any }) => {
+            return dataSources.providerAPI.privatePersonByProviderId(parent.id);
         }
     },
     Organisation: {

src/schema/type-defs.ts

@@ -412,41 +412,41 @@ input EquipmentTypeUpdateInput {
 "An Event is a point in time, when the state of the bike somehow changed."
 type BikeEvent {
     id: ID!
-    eventType: BikeEventType!
+    bikeEventType: BikeEventType!
     cargoBike: CargoBike!
+    responsible: Participant
+    related: Participant
     date: Date!
-    note: String
+    description: String
     """
     Path to documents
     """
     documents: [String]!    
+    remark: String
 }
 
 input BikeEventCreateInput {
-    eventType: BikeEventType!
+    bikeEventTypeId: ID!
-    "it is enough to pass the cargoBike id"
     cargoBikeId: ID!
+    responsibleId: ID
+    relatedId: ID
     date: Date!
-    note: String
+    description: String
     """
     Path to documents
     """
-    documents: [String]!
+    documents: [String]
+    remark: String
 }
 
-"TODO: Some eventTypes are missing"
+type BikeEventType {
-enum BikeEventType {
+    id: ID!
-    """
+    name: String!
-    The enum EventType can also be represented as an enum in postgresQL.
+}
-    It is possible to add items to an enum in postgresQL without changing the source code.
+
-    However, it not possible to change the graphQL schema.
+input BikeEventTypeInput {
-    Concluding we should not use an enum here, if users want to add EventTypes to the enum.
+    id: ID!
-    """
+    name: String
-    KAUF
-    INBETRIEBNAHME
-    AUSFALL
-    WARTUNG
-    ANDERE
 }
 
 "How are the dimensions and how much weight can handle a bike. This data is merged in the CargoBike table and the BikeModel table."
@@ -803,12 +803,16 @@ type Query {
     timeframes(offset: Int!, limit: Int!): [TimeFrame]!
     contactInformation(offset: Int!, limit: Int!): [ContactInformation]!
     persons(offset: Int!, limit: Int!): [Person]
+    bikeEventTypes(offset: Int!, limit: Int!): [BikeEventType]
     "returns BikeEvent with CargoBike"
     bikeEventById(id:ID!): BikeEvent!
 }
 
 type Mutation {
-    "creates new cargoBike and returns cargobike with new ID"
+    """
+    CargoBikes
+    creates new cargoBike and returns cargobike with new ID
+    """
     createCargoBike(cargoBike: CargoBikeCreateInput!): CargoBike!
     "lock cargoBike returns bike if bike is not locked and locks bike or Error if bike cannot be locked"
     lockCargoBikeById(id: ID!): CargoBike!
@@ -816,7 +820,10 @@ type Mutation {
     unlockCargoBikeById(id: ID!): Boolean!
     "updates cargoBike of given ID with supplied fields and returns updated cargoBike"
     updateCargoBike(cargoBike: CargoBikeUpdateInput!): CargoBike!
-    "creates new peace of unique Equipment"
+    """
+    EQUIPMENT
+    creates new peace of unique Equipment
+    """
     createEquipment(equipment: EquipmentCreateInput!): Equipment!
     "lock equipment returns true if bike is not locked or if it doesnt exist"
     lockEquipmentById(id: ID!): Equipment!
@@ -825,13 +832,20 @@ type Mutation {
     "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!
     createEquipmentType(equipmentType: EquipmentTypeCreateInput!): EquipmentType!
-    "creates new lendingStation and returns lendingStation with new ID"
+    """
+    LENDINGSTATION
+    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!
     createTimeFrame(timeFrame: TimeFrameCreateInput!): TimeFrame!
+    """
+    BIKEEVENT
+    """
+    createBikeEventType(name: String!): BikeEventType!
     "creates new BikeEvent"
-    createBikeEvent(bikeEvent: BikeEventCreateInput): BikeEvent!
+    createBikeEvent(bikeEvent: BikeEventCreateInput!): BikeEvent!
     "create participant"
     createParticipant(participant: ParticipantCreateInput!): Participant!
     createWorkshopType(workshopType: WorkshopTypeCreateInput!): WorkshopType!