File tree Expand file tree Collapse file tree 1 file changed +13
-4
lines changed
Expand file tree Collapse file tree 1 file changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -10,20 +10,29 @@ export class DepartmentService {
1010 const userResults = await directory . searchByEmail ( userEmail ) ;
1111 const superResults = await directory . searchByEmail ( supervisorEmail ) ;
1212
13- let department = await db ( "departments" ) . first ( ) ;
14-
1513 if ( userResults && userResults . length > 0 ) {
1614 await db ( "users" ) . where ( { email : userEmail } ) . update ( { department : userResults [ 0 ] . department } ) ;
1715 const userDepart = await db ( "departments" ) . where ( { name : userResults [ 0 ] . department } ) . first < Department > ( ) ;
18- if ( userDepart ) department = userDepart ;
16+ if ( userDepart ) return userDepart ;
1917 }
2018
2119 if ( superResults && superResults . length > 0 ) {
2220 await db ( "users" ) . where ( { email : supervisorEmail } ) . update ( { department : superResults [ 0 ] . department } ) ;
2321 const superDepart = await db ( "departments" ) . where ( { name : superResults [ 0 ] . department } ) . first < Department > ( ) ;
24- if ( superDepart ) department = superDepart ;
22+ if ( superDepart ) return superDepart ;
23+ }
24+
25+ if ( userEmail . endsWith ( "@wcb.yk.ca" ) || supervisorEmail . endsWith ( "@wcb.yk.ca" ) ) {
26+ const wcbDepart = await db ( "departments" ) . where ( { code : "WSCB" } ) . first < Department > ( ) ;
27+ if ( wcbDepart ) return wcbDepart ;
28+ }
29+
30+ if ( userEmail . endsWith ( "@yesnet.yk.ca" ) || supervisorEmail . endsWith ( "@yesnet.yk.ca" ) ) {
31+ const eduDepart = await db ( "departments" ) . where ( { code : "EDU" } ) . first < Department > ( ) ;
32+ if ( eduDepart ) return eduDepart ;
2533 }
2634
35+ let department = await db ( "departments" ) . where ( { code : "UNK" } ) . first ( ) ;
2736 return department ;
2837 }
2938}
You can’t perform that action at this time.
0 commit comments