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

datasource/*: code a little clean up

Browse Source
pull/14/head
leonnicolas 4 years ago
parent 45a7fa6ec7
commit a67c0ff659
No known key found for this signature in database
GPG Key ID: 088D0743E2B65C07
5 changed files with 39 additions and 52 deletions
Show Stats Download Patch File Download Diff File

41
src/datasources/db/cargobikeAPI.ts
Unescape Escape View File

@ -134,29 +134,24 @@ export class CargoBikeAPI extends DataSource {
*/ */
async createCargoBike ({ cargoBike }: { cargoBike: any }) { async createCargoBike ({ cargoBike }: { cargoBike: any }) {
let inserts: any; let inserts: any;
try { await this.connection.transaction(async (entityManager:any) => {
await this.connection.transaction(async (entityManager:any) => { inserts = await entityManager.getRepository(CargoBike)
inserts = await entityManager.getRepository(CargoBike) .createQueryBuilder('cargobike')
.createQueryBuilder('cargobike') .insert()
.insert() .values([cargoBike])
.values([cargoBike]) .returning('*')
.returning('*') .execute();
.execute(); await entityManager.getRepository(CargoBike)
await entityManager.getRepository(CargoBike) .createQueryBuilder('cargobike')
.createQueryBuilder('cargobike') .relation(CargoBike, 'provider')
.relation(CargoBike, 'provider') .of(inserts.identifiers[0].id)
.of(inserts.identifiers[0].id) .set(cargoBike?.providerId);
.set(cargoBike?.providerId); cargoBike?.equipmentTypeIds && await entityManager.getRepository(CargoBike)
cargoBike?.equipmentTypeIds && await entityManager.getRepository(CargoBike) .createQueryBuilder('cargobike')
.createQueryBuilder('cargobike') .relation(CargoBike, 'equipmentTypeIds')
.relation(CargoBike, 'equipmentTypeIds') .of(inserts.identifiers[0].id)
.of(inserts.identifiers[0].id) .add(cargoBike.equipmentTypeIds);
.add(cargoBike.equipmentTypeIds); });
});
} catch (e: any) {
console.log(e);
return new GraphQLError('Transaction could not be completed');
}
const newbike = inserts.generatedMaps[0]; const newbike = inserts.generatedMaps[0];
newbike.id = inserts.identifiers[0].id; newbike.id = inserts.identifiers[0].id;
return newbike; return newbike;

1
src/datasources/db/contactinformationAPI.ts
Unescape Escape View File

@ -105,7 +105,6 @@ export class ContactInformationAPI extends DataSource {
.select() .select()
.where('ci."personId" = :id', { id: id }) .where('ci."personId" = :id', { id: id })
.getMany(); .getMany();
console.log(res);
return res; return res;
} }

6
src/datasources/db/lendingstationAPI.ts
Unescape Escape View File

@ -176,7 +176,6 @@ export class LendingStationAPI extends DataSource {
.where('timeframe."cargoBikeId" = :id', { id: timeFrame.cargoBikeId }) .where('timeframe."cargoBikeId" = :id', { id: timeFrame.cargoBikeId })
.andWhere('timeframe."dateRange" && :tr', { tr: timeFrame.dateRange }) .andWhere('timeframe."dateRange" && :tr', { tr: timeFrame.dateRange })
.getMany(); .getMany();
console.log(overlapping);
if (overlapping.length !== 0) { if (overlapping.length !== 0) {
throw new UserInputError('TimeFrames with ids: ' + overlapping.map((e) => { return e.id + ', '; }) + 'are overlapping'); throw new UserInputError('TimeFrames with ids: ' + overlapping.map((e) => { return e.id + ', '; }) + 'are overlapping');
} }
@ -198,7 +197,6 @@ export class LendingStationAPI extends DataSource {
.set(timeFrame.lendingStationId); .set(timeFrame.lendingStationId);
}); });
} catch (e) { } catch (e) {
console.log(e);
if (e instanceof UserInputError) { if (e instanceof UserInputError) {
return e; return e;
} else if (e instanceof QueryFailedError) { } else if (e instanceof QueryFailedError) {
@ -210,7 +208,7 @@ export class LendingStationAPI extends DataSource {
return inserts.generatedMaps[0]; return inserts.generatedMaps[0];
} }
/* async updateTimeFrame (timeFrame: any) { /* async updateTimeFrame (timeFrame: any) {
try { try {
await this.connection.transaction(async (entityManager: EntityManager) => { await this.connection.transaction(async (entityManager: EntityManager) => {
if (timeFrame.to === undefined) { if (timeFrame.to === undefined) {
@ -260,5 +258,5 @@ export class LendingStationAPI extends DataSource {
} }
inserts.generatedMaps[0].id = inserts.identifiers[0].id; inserts.generatedMaps[0].id = inserts.identifiers[0].id;
return inserts.generatedMaps[0]; return inserts.generatedMaps[0];
}*/ } */
} }

42
src/datasources/db/providerAPI.ts
Unescape Escape View File

@ -29,29 +29,25 @@ export class ProviderAPI extends DataSource {
async createProvider (provider: any) { async createProvider (provider: any) {
let inserts: any; let inserts: any;
try { await this.connection.transaction(async (entityManager: any) => {
await this.connection.transaction(async (entityManager: any) => { inserts = await entityManager.getRepository(Provider)
inserts = await entityManager.getRepository(Provider) .createQueryBuilder('provider')
.createQueryBuilder('provider') .insert()
.insert() .values([provider])
.values([provider]) .returning('*')
.returning('*') .execute();
.execute(); await entityManager.getRepository(Provider)
await entityManager.getRepository(Provider) .createQueryBuilder('provider')
.createQueryBuilder('provider') .relation(Provider, 'cargoBikes')
.relation(Provider, 'cargoBikes') .of(inserts.identifiers[0].id)
.of(inserts.identifiers[0].id) .add(provider.cargoBikeIds);
.add(provider.cargoBikeIds); await entityManager.getRepository(Provider)
await entityManager.getRepository(Provider) .createQueryBuilder('provider')
.createQueryBuilder('provider') .relation(Provider, 'contactPersons')
.relation(Provider, 'contactPersons') .of(inserts.identifiers[0].id)
.of(inserts.identifiers[0].id) .add(provider.contactPersonIds);
.add(provider.contactPersonIds); });
});
} catch (e: any) {
console.log(e);
return new GraphQLError('Transaction could not be completed');
}
const ret = inserts.generatedMaps[0]; const ret = inserts.generatedMaps[0];
ret.id = inserts.identifiers[0].id; ret.id = inserts.identifiers[0].id;
return ret; return ret;

1
src/resolvers/contactinformationResolvers.ts
Unescape Escape View File

@ -40,7 +40,6 @@ export default {
ContactInformation: { ContactInformation: {
person: (parent: any, __: any, { dataSources, req }: { dataSources: any, req: any }) => { person: (parent: any, __: any, { dataSources, req }: { dataSources: any, req: any }) => {
if (req.permissions.includes(Permission.ReadPerson)) { if (req.permissions.includes(Permission.ReadPerson)) {
console.log(parent);
return dataSources.contactInformationAPI.personByContactInformationId(parent.id); return dataSources.contactInformationAPI.personByContactInformationId(parent.id);
} else { } else {
return new GraphQLError('Insufficient Permissions'); return new GraphQLError('Insufficient Permissions');

Write Preview
Loading…
Cancel
Save