Skip to content

Commit 4dfaa51

Browse files
Return session and user info for Admin
1 parent afb2fa8 commit 4dfaa51

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

src/controller/Admin.controller.ts

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
'use strict';
22

3+
import { Repository } from 'typeorm';
34
/* Import database configuration */
45
import { connect } from '../config/config';
56
import { COASTERS_NOT_FOUND, COASTERS_NOT_LINKED, COASTER_ACC_REVOKED } from '../config/messages';
67

78
/* Import entities */
89
import { Coasters } from '../entity/Coasters';
10+
import { Session } from '../entity/Session';
11+
import { Users } from '../entity/Users';
912

1013
exports.updateCoaster = (coasterId, { encoded, group }) => {
1114
return new Promise(async (resolve, reject) => {
@@ -50,10 +53,16 @@ exports.getCoaster = (coasterId: string) => {
5053
return new Promise(async (resolve, reject) => {
5154
try {
5255
const connection = await connect();
53-
const repo = connection.getRepository(Coasters);
54-
55-
let [coaster] = await repo.find({ where: { coasterId } });
56-
resolve(coaster);
56+
const coasterRepo = connection.getRepository(Coasters);
57+
const sessionRepo = connection.getRepository(Session);
58+
const usersRepo = connection.getRepository(Users);
59+
60+
let [coaster] = await coasterRepo.find({ where: { coasterId } });
61+
let [session] = await sessionRepo.find({ where: { userId: coaster.userId, active: true } });
62+
let [user] = await usersRepo.find({ where: { userId: coaster.userId }});
63+
let { userId, email, displayName, createdAt } = user;
64+
65+
resolve({ coaster, session, user: { userId, email, displayName, createdAt } });
5766
} catch (error) {
5867
reject(error);
5968
}

0 commit comments

Comments
 (0)