{
- if (error) {
- return {error.message}
;
- } else if (props) {
- console.log(JSON.stringify(props));
- var notifications = props.team_notifications;
- var colors = ["#A8C5D6", "#CCBEDF"];
- var count = 0;
- var notificationCards = notifications.map((notif) => {
- return (
-
- );
- });
- let notificationMesssage = notificationCards.length > 0 ? notificationCards :
- "No notifications right now!"
- return (
-
-
-
- Notifications
-
- {notificationMesssage}
-
-
-
-
- );
- }
- }}
- />
- );
- }
+ render() {
+ return (
+ {
+ if (error) {
+ return {error.message}
;
+ } else if (props) {
+ console.log(JSON.stringify(props));
+ var notifications = props.team_notifications;
+ var colors = ["#A8C5D6", "#CCBEDF"];
+ var count = 0;
+ var notificationCards = notifications.map((notif) => {
+ return (
+
+ );
+ });
+ let notificationMesssage =
+ notificationCards.length > 0
+ ? notificationCards
+ : "No notifications right now!";
+ return (
+
+
+
+
+ Notifications
+
+
+ {notificationMesssage}
+
+
+
+
+ );
+ }
+ }}
+ />
+ );
+ }
}
export default TeamNotifications;
diff --git a/client/src/components/TeamPage.js b/client/src/components/TeamPage.js
index b90f12c0..76395fae 100644
--- a/client/src/components/TeamPage.js
+++ b/client/src/components/TeamPage.js
@@ -21,6 +21,7 @@ const getTeamQuery = graphql `
picture
members {
name
+ email
school
grad_year
contact
diff --git a/client/src/components/TeamRequestsSent.js b/client/src/components/TeamRequestsSent.js
index 20ad3b57..19047c9a 100644
--- a/client/src/components/TeamRequestsSent.js
+++ b/client/src/components/TeamRequestsSent.js
@@ -1,94 +1,104 @@
-import React, { Component } from 'react';
-import { Card, Container } from 'semantic-ui-react'
-import NotificationCard from './NotificationCard';
+import React, { Component } from "react";
+import { Card, Container } from "semantic-ui-react";
+import NotificationCard from "./NotificationCard";
import { QueryRenderer } from "react-relay";
import { graphql } from "babel-plugin-relay/macro";
import environment from "./Environment";
import "./css/NotificationCard.css";
const getSentRequestsQuery = graphql`
- query TeamRequestsSentQuery {
- sent_team_notifications {
- id
- message
- bio
- idea
- sender {
- __typename
- ... on User {
- id
- name
- }
- __typename
- ... on Team {
- name
- }
+ query TeamRequestsSentQuery($sent: Boolean) {
+ team_notifications(sent: $sent) {
+ id
+ message
+ bio
+ idea
+ sender {
+ __typename
+ ... on User {
+ id
+ name
}
- senderType
- receiver {
- __typename
- ... on User {
- id
- name
- }
- __typename
- ... on Team {
- name
- }
+ __typename
+ ... on Team {
+ name
}
- resolved
+ }
+ senderType
+ receiver {
+ __typename
+ ... on User {
+ id
+ name
}
+ __typename
+ ... on Team {
+ name
+ }
+ }
+ resolved
}
+ }
`;
class TeamRequestsSent extends Component {
- render() {
- return(
- {
- if (error) {
- return {error.message}
;
- } else if (props) {
- console.log(JSON.stringify(props));
- var sent_requests = props.sent_team_notifications;
- var colors = ["#A8C5D6", "#CCBEDF"];
- var count = 0;
- var sentRequestCards = sent_requests.map((notif) => {
- return (
-
- );
- });
- return (
-
-
-
- Requests Sent
-
- {sentRequestCards}
-
-
-
-
- );
- }
- }}
- />
- );
- }
+ render() {
+ return (
+ {
+ if (error) {
+ return {error.message}
;
+ } else if (props) {
+ console.log(JSON.stringify(props));
+ var sent_requests = props.team_notifications;
+ var colors = ["#A8C5D6", "#CCBEDF"];
+ var count = 0;
+ var sentRequestCards = sent_requests.map((notif) => {
+ return (
+
+ );
+ });
+ return (
+
+
+
+
+ Requests Sent
+
+
+ {sentRequestCards}
+
+
+
+
+ );
+ }
+ }}
+ />
+ );
+ }
}
-export default TeamRequestsSent;
\ No newline at end of file
+export default TeamRequestsSent;
diff --git a/client/src/components/__generated__/MembersQuery.graphql.js b/client/src/components/__generated__/MembersQuery.graphql.js
deleted file mode 100644
index 04f691e0..00000000
--- a/client/src/components/__generated__/MembersQuery.graphql.js
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- * @flow
- * @relayHash 6d447e2993b792053877d4e8d9a51fb9
- */
-
-/* eslint-disable */
-
-'use strict';
-
-/*::
-import type { ConcreteRequest } from 'relay-runtime';
-export type MembersQueryVariables = {||};
-export type MembersQueryResponse = {|
- +user_profile: {|
- +team: ?{|
- +members: ?$ReadOnlyArray,
- +experience: ?string,
- |}>
- |}
- |}
-|};
-export type MembersQuery = {|
- variables: MembersQueryVariables,
- response: MembersQueryResponse,
-|};
-*/
-
-
-/*
-query MembersQuery {
- user_profile {
- team {
- members {
- name
- school
- grad_year
- contact
- skills
- experience
- id
- }
- id
- }
- id
- }
-}
-*/
-
-const node/*: ConcreteRequest*/ = (function(){
-var v0 = {
- "kind": "ScalarField",
- "alias": null,
- "name": "name",
- "args": null,
- "storageKey": null
-},
-v1 = {
- "kind": "ScalarField",
- "alias": null,
- "name": "school",
- "args": null,
- "storageKey": null
-},
-v2 = {
- "kind": "ScalarField",
- "alias": null,
- "name": "grad_year",
- "args": null,
- "storageKey": null
-},
-v3 = {
- "kind": "ScalarField",
- "alias": null,
- "name": "contact",
- "args": null,
- "storageKey": null
-},
-v4 = {
- "kind": "ScalarField",
- "alias": null,
- "name": "skills",
- "args": null,
- "storageKey": null
-},
-v5 = {
- "kind": "ScalarField",
- "alias": null,
- "name": "experience",
- "args": null,
- "storageKey": null
-},
-v6 = {
- "kind": "ScalarField",
- "alias": null,
- "name": "id",
- "args": null,
- "storageKey": null
-};
-return {
- "kind": "Request",
- "fragment": {
- "kind": "Fragment",
- "name": "MembersQuery",
- "type": "Query",
- "metadata": null,
- "argumentDefinitions": [],
- "selections": [
- {
- "kind": "LinkedField",
- "alias": null,
- "name": "user_profile",
- "storageKey": null,
- "args": null,
- "concreteType": "User",
- "plural": false,
- "selections": [
- {
- "kind": "LinkedField",
- "alias": null,
- "name": "team",
- "storageKey": null,
- "args": null,
- "concreteType": "Team",
- "plural": false,
- "selections": [
- {
- "kind": "LinkedField",
- "alias": null,
- "name": "members",
- "storageKey": null,
- "args": null,
- "concreteType": "User",
- "plural": true,
- "selections": [
- (v0/*: any*/),
- (v1/*: any*/),
- (v2/*: any*/),
- (v3/*: any*/),
- (v4/*: any*/),
- (v5/*: any*/)
- ]
- }
- ]
- }
- ]
- }
- ]
- },
- "operation": {
- "kind": "Operation",
- "name": "MembersQuery",
- "argumentDefinitions": [],
- "selections": [
- {
- "kind": "LinkedField",
- "alias": null,
- "name": "user_profile",
- "storageKey": null,
- "args": null,
- "concreteType": "User",
- "plural": false,
- "selections": [
- {
- "kind": "LinkedField",
- "alias": null,
- "name": "team",
- "storageKey": null,
- "args": null,
- "concreteType": "Team",
- "plural": false,
- "selections": [
- {
- "kind": "LinkedField",
- "alias": null,
- "name": "members",
- "storageKey": null,
- "args": null,
- "concreteType": "User",
- "plural": true,
- "selections": [
- (v0/*: any*/),
- (v1/*: any*/),
- (v2/*: any*/),
- (v3/*: any*/),
- (v4/*: any*/),
- (v5/*: any*/),
- (v6/*: any*/)
- ]
- },
- (v6/*: any*/)
- ]
- },
- (v6/*: any*/)
- ]
- }
- ]
- },
- "params": {
- "operationKind": "query",
- "name": "MembersQuery",
- "id": null,
- "text": "query MembersQuery {\n user_profile {\n team {\n members {\n name\n school\n grad_year\n contact\n skills\n experience\n id\n }\n id\n }\n id\n }\n}\n",
- "metadata": {}
- }
-};
-})();
-// prettier-ignore
-(node/*: any*/).hash = 'f3900c2b67de63c1f97f5c341e62ed33';
-module.exports = node;
diff --git a/client/src/components/__generated__/TeamNotificationsQuery.graphql.js b/client/src/components/__generated__/TeamNotificationsQuery.graphql.js
index e0e377cb..dea4a81f 100644
--- a/client/src/components/__generated__/TeamNotificationsQuery.graphql.js
+++ b/client/src/components/__generated__/TeamNotificationsQuery.graphql.js
@@ -1,6 +1,6 @@
/**
* @flow
- * @relayHash c8d6d980ec6cebf22be41e847a1b8831
+ * @relayHash a1f820eb14477e077db63be7ae4d8c39
*/
/* eslint-disable */
@@ -9,7 +9,9 @@
/*::
import type { ConcreteRequest } from 'relay-runtime';
-export type TeamNotificationsQueryVariables = {||};
+export type TeamNotificationsQueryVariables = {|
+ sent?: ?boolean
+|};
export type TeamNotificationsQueryResponse = {|
+team_notifications: $ReadOnlyArray((user, done) => {
- done(null, user.uuid);
-});
-passport.deserializeUser((id, done) => {
- User.findOne({ uuid: id }, (err, user) => {
- done(err, user!);
- });
-});
-
-let getTeam = async function (parent, args, context, info, req) {
- if (!context._id) {
- throw new Error("User is not logged in!");
- }
- let team = await Team.findById(args.team_id).populate("members");
- if (!team) {
- throw new Error("Team not found!");
- }
- return team;
-};
-let getTeams = async function (parent, args, context, info, req) {
- console.log("getting teams..");
- let teams;
- let search;
- let interests;
- let interestSearch = [] as {}[];
-
- if (args.search) {
- search = '"' + args.search.split(" ").join('" "') + '"';
- }
-
- if (args.interests) {
- interests = args.interests.match(/\w+/g);
- for (let i = 0; i < interests.length; i++) {
- interestSearch.push({
- interests: {
- $elemMatch: { $regex: ".*" + interests[i] + ".*", $options: "i" },
- },
- });
- }
- }
-
- if (search && interests) {
- console.log("search and interest filters applied");
- teams = await Team.find({
- $and: [
- { public: true },
- { $text: { $search: search } },
- { $and: interestSearch },
- ],
- }).populate("members");
- } else if (search) {
- console.log(`searching for ${search}..`);
- teams = await Team.find({
- $and: [{ public: true }, { $text: { $search: search } }],
- }).populate("members");
- } else if (interests) {
- console.log(`interest filter(s) applied: ${interestSearch}`);
- teams = await Team.find({
- $and: [{ public: true }, { $and: interestSearch }],
- }).populate("members");
- } else {
- console.log("no filter applied");
- teams = await Team.find({
- public: true,
- }).populate("members");
- }
-
- if (!teams) {
- return null;
- }
-
- teams.sort(function (a, b) {
- return a.name.toLowerCase() - b.name.toLowerCase();
- });
- return teams;
-};
-
-let getUser = async function (parent, args, context, info, req) {
- if (!context._id) {
- throw new Error("User not logged in");
- }
- let user = await User.findById(args.user_id);
- if (!user) {
- throw new Error("User not found");
- }
- return user;
-};
-
-let getUsers = async function (parent, args, context, info, req) {
- if (!context._id) {
- throw new Error("User not logged in");
- }
- console.log("getting users..");
- let users;
- let search;
- let skills;
- let grad_years;
- let schools;
- let skillSearch = [] as {}[];
- let yearSearch = [] as {}[];
- let schoolSearch = [] as {}[];
-
- if (args.search) {
- search = '"' + args.search.split(" ").join('" "') + '"';
- }
- if (args.skill) {
- skills = args.skill.match(/\w+/g);
- for (let i = 0; i < skills.length; i++) {
- skillSearch.push({
- skills: {
- $elemMatch: { $regex: ".*" + skills[i] + ".*", $options: "i" },
- },
- });
- }
- }
- if (args.grad_year) {
- grad_years = args.grad_year.match(/\w+/g);
- for (let i = 0; i < grad_years.length; i++) {
- yearSearch.push({ grad_year: grad_years[i] });
- }
- }
- if (args.school) {
- schools = args.school.split(",");
- for (let i = 0; i < schools.length; i++) {
- schoolSearch.push({ school: schools[i] });
- }
- }
-
- if (search && skills && grad_years && schools) {
- console.log("all filters applied...");
- users = await User.find({
- $and: [
- { $text: { $search: search } },
- { $and: skillSearch },
- { $or: yearSearch },
- { $or: schoolSearch },
- ],
- visible: 1
- });
- } else if (search && skills && grad_years) {
- console.log("search, skills, and grad year filters applied...");
- users = await User.find({
- $and: [
- { $text: { $search: search } },
- { $and: skillSearch },
- { $or: yearSearch },
- ],
- visible: 1
- });
- } else if (search && skills && schools) {
- console.log("search, skills, and schools filters applied...");
- users = await User.find({
- $and: [
- { $text: { $search: search } },
- { $and: skillSearch },
- { $or: schoolSearch },
- ],
- visible: 1
- });
- } else if (search && grad_years && schools) {
- console.log("searc, grad year, and schools filters applied...");
- users = await User.find({
- $and: [
- { $text: { $search: search } },
- { $or: yearSearch },
- { $or: schoolSearch },
- ],
- visible: 1
- });
- } else if (skills && grad_years && schools) {
- console.log("skills, grad year, and schools filter applied...");
- users = await User.find({
- $and: [{ $and: skillSearch }, { $or: yearSearch }, { $or: schoolSearch }],visible: 1
- }
- );
- } else if (search && skills) {
- console.log("search and skills filters applied...");
- users = await User.find({
- $and: [{ $text: { $search: search } }, { $and: skillSearch }], visible: 1
- });
- } else if (search && grad_years) {
- console.log("search and grad year filters applied...");
- users = await User.find({
- $and: [{ $text: { $search: search } }, { $or: yearSearch }], visible: 1
- });
- } else if (search && schools) {
- console.log("search and schools filters applied...");
- users = await User.find({
- $and: [{ $text: { $search: search } }, { $or: schoolSearch }], visible: 1
- });
- } else if (skills && grad_years) {
- console.log("skill and year filters applied");
- users = await User.find({
- $and: [{ $and: skillSearch }, { $or: yearSearch }], visible: 1
- });
- } else if (skills && schools) {
- console.log("only skill and school filters applied");
- users = await User.find({
- $and: [{ $and: skillSearch }, { $or: schoolSearch }],visible: 1
- });
- } else if (grad_years && schools) {
- console.log("only year and school filters applied");
- users = await User.find({
- $and: [{ $or: yearSearch }, { $or: schoolSearch }], visible: 1
- });
- } else if (search) {
- console.log(`searching for ${search}..`);
- users = await User.find({ $text: { $search: search }, visible: 1 });
- console.log(users);
- } else if (skills) {
- console.log("only skill filter(s) applied");
- users = await User.find({
- $and: skillSearch, visible: 1
- });
- } else if (grad_years) {
- console.log("only year filter(s) applied");
- users = await User.find({
- $or: yearSearch, visible: 1
- });
- } else if (schools) {
- console.log("only school filter(s) applied");
- users = await User.find({
- $or: schoolSearch, visible: 1
- });
- } else {
- console.log("no filters applied");
- users = await User.find({visible: 1});
- }
-
- if (!users) {
- return null;
- }
-
- users = users
- .sort(function (a, b) {
- return a.name.toLowerCase() - b.name.toLowerCase();
- })
- .filter((item) => {
- return item.uuid != context.uuid && !item.team && item.visible == 1;
- });
- return users;
-};
-
-let updateUser = async function (parent, args, context, info, req) {
- console.log(context._id);
- if (!context._id) {
- throw new Error("User not logged in");
- }
- return await User.findByIdAndUpdate(
- context._id,
- { $set: args },
- { new: true }
- );
-};
-
-let updateTeam = async function (parent, args, context, info, req) {
- console.log(context._id);
- if (!context._id) {
- throw new Error("User not logged in");
- }
- let user = await User.findById(context._id).populate("team");
- if (!user) {
- throw new Error("User not found");
- }
- if (!user.team) {
- throw new Error("User not on team");
- }
- return await Team.findByIdAndUpdate(user.team, { $set: args }, { new: true });
-};
-
-let leaveTeam = async function (parent, args, context, info, req) {
- console.log("leaveing team");
-
- if (!context._id) {
- throw new Error("User not logged in");
- }
- if (!context.team) {
- throw new Error("User not on team");
- }
-
- await Team.findByIdAndUpdate(
- context.team,
- {
- $pull: {
- members: context._id,
- },
- },
- async (err, team) => {
- if (err || !team) {
- console.log(err);
- throw new Error("Issue updating team");
- }
- console.log("TTTEAM", team);
- if (team.members.length <= 1) {
- await Team.findByIdAndDelete(context.team);
- }
- }
- );
-
- return await User.findByIdAndUpdate(context._id, {
- team: null,
- });
-};
-
-let getSentTeamNotifications = async function (
- parent,
- args,
- context,
- info,
- req
-) {
- if (!context._id) {
- throw new Error("User not logged in");
- }
- let user = await User.findById(context._id);
- if (!user) {
- throw new Error("User not found");
- }
- if (!user.team) {
- throw new Error("User not on teams");
- }
- return await Notification.find({
- sender: user.team,
- resolved: false,
- }).populate("receiver");
-};
-
-let getUserProfile = async function (parent, args, context, info, req) {
- return await User.findById(context._id).populate("team");
-};
-
-/*
- Accepting a user sending request to team
- */
-let acceptTeamRequest = async function (parent, args, context, info, req) {
- if (!context._id) {
- throw new Error("User not logged in");
- }
- let user = await User.findById(context._id).populate("team");
- if (!user) {
- throw new Error("User not found");
- }
- if (!user.team) {
- throw new Error("User not on team");
- }
- if (user.team.members.length >= 4) {
- throw new Error("Team is full");
- }
- let notification = await Notification.findById(args.notification_id)
- .populate("sender")
- .populate("receiver");
- if (!notification) {
- throw new Error("Notification does not exist");
- }
- if (notification.senderType == "Team") {
- throw new Error("Cannot accept request from a team");
- }
- if (notification.senderType == "User") {
- console.log(
- "TEAM",
- user.team._id.toString(),
- notification.receiver._id.toString()
- );
-
- if (user.team._id.toString() !== notification.receiver._id.toString()) {
- throw new Error("Team does not own notification");
- }
- let requestUser = await User.findById(notification.sender._id);
- if (!requestUser) {
- throw new Error("Notificaton sender not found");
- }
- if (requestUser.team) {
- throw new Error("Sender already on team");
- }
- console.log("here2");
-
- let requestedUserId = requestUser._id;
- console.log(requestedUserId);
- console.log(user.team._id);
- console.log(mongoose.Types.ObjectId.isValid(requestedUserId));
- console.log(mongoose.Types.ObjectId.isValid(user.team._id));
-
- await Team.findByIdAndUpdate(
- user.team._id,
- {
- $push: {
- members: requestedUserId,
- },
- },
- function (err, user) {
- console.log("here");
- console.log(err);
- }
- );
- await User.findByIdAndUpdate(notification.sender._id, {
- team: user.team._id,
- });
- await Notification.updateMany({ sender: notification.sender._id, receiver: notification.receiver._id }, {
- resolved: true,
- });
-
- sendSlackMessage(
- `${
- user!.team!.name
- } has accepted your request. View your new team here: https://teamformation.hack.gt/team/${user.team._id}`,
- requestUser.slackid
- );
- console.log("slack message sent");
- } else {
- throw new Error("Notification invalid");
- }
-};
-
-let acceptUserRequest = async function (parent, args, context, info, req) {
- if (!context._id) {
- throw new Error("User not logged in");
- }
- let user = await User.findById(context._id);
- if (!user) {
- throw new Error("User not found");
- }
-
- let notification = await Notification.findById(args.notification_id)
- .populate("sender")
- .populate("receiver");
- if (!notification) {
- throw new Error("Notification not found");
- }
- console.log("ACCEPT USER REQUEST");
- console.log(notification.receiver._id);
- console.log(user._id);
-
- if (notification.receiver._id.toString() != user._id.toString()) {
- throw new Error("Notification not valid");
- }
- await Notification.findByIdAndUpdate(notification._id, {
- resolved: true,
- });
- if (notification.senderType == "Team") {
- if (user.team) {
- throw new Error("User already on team");
- }
- if (!notification.sender) {
- throw new Error("Team no longer exists");
- }
- if (notification.sender.members.length >= 4) {
- throw new Error("Team is full");
- }
- let team = await Team.findByIdAndUpdate(notification.sender._id, {
- $push: {
- members: user,
- },
- }).populate("members");
- await User.findByIdAndUpdate(context._id, {
- team: notification.sender._id,
- });
- let teamSlackIDs: any = [];
- team!.members.forEach((member) => {
- teamSlackIDs.push(member.slackid);
- });
- var index = teamSlackIDs.indexOf(user.slackid);
- if (index != -1) {
- teamSlackIDs.splice(index, 1);
- }
- teamSlackIDs.forEach((id) => {
- sendSlackMessage(
- `${context.name} has accepted your request. View your team here: https://teamformation.hack.gt/feed`,
- id
- );
- });
- console.log("slack message sent");
- return team;
- } else if (notification.senderType == "User") {
- let user1 = await User.findById(context._id);
- let user2 = await User.findById(notification.sender);
- console.log(user1 + " " + user2);
- if (user1 && user2) {
- if (user1.team) {
- throw new Error("User already on a team!");
- }
- if (user2.team) {
- throw new Error("Requesting user already on team");
- }
- var team = new Team({
- name: "Team " + user1._id + "" + user2._id,
- members: [user1, user2],
- public: true,
- });
- return await team.save(function (err, team) {
- if (err) {
- console.log(err);
- }
- if (!user1) {
- throw new Error("User1 not defined");
- }
- if (!user2) {
- throw new Error("User2 not defined");
- }
- user1.team = team;
- user2.team = team;
- user1.save(function (err) {
- if (err) {
- console.log(err);
- throw new Error(err);
- }
- });
- user2.save(function (err) {
- if (err) {
- console.log(err);
- throw new Error(err);
- }
- });
- sendSlackMessage(
- `${context.name} has accepted your request. View your team here: https://teamformation.hack.gt/feed`,
- user2.slackid
- );
- console.log("slack message sent");
- });
- } else {
- throw new Error("User not defined");
- }
- } else {
- throw new Error("Notification invalid");
- }
-};
-
-let makeUserRequest = async function (parent, args, context, info, req) {
- if (!context._id) {
- throw new Error("User not logged in");
- }
- let notification;
- let receiver_id = args.user_id;
- let receiver = await User.findById(receiver_id);
- let senderName = context.name;
- if (!receiver) {
- throw new Error("Receiver user not found");
- }
- if (receiver.team) {
- throw new Error("Requested user already on team");
- }
- if (!context.team) {
- //if user is not on a team
- notification = new Notification({
- bio: args.bio,
- idea: args.idea,
- senderType: "User",
- receiverType: "User",
- sender: context._id,
- receiver: receiver_id,
- resolved: false,
- });
- } else {
- let team = await Team.findById(context.team);
- if (!team) {
- throw new Error("Team not found");
- }
- notification = new Notification({
- bio: args.bio,
- idea: args.idea,
- senderType: "Team",
- receiverType: "User",
- sender: team._id,
- receiver: receiver_id,
- resolved: false,
- });
- senderName = team.name;
- }
-
- return await notification.save((err, notif) => {
- if (err) {
- throw new Error("Error creating notification: " + notif);
- }
- User.findByIdAndUpdate(receiver_id, {
- $push: {
- notifications: notif,
- },
- });
- sendSlackMessage(
- `You have received a request from ${senderName}. Accept or deny the request here: https://teamformation.hack.gt/feed`,
- receiver!.slackid
- );
- if (!context.team) {
- sendSlackMessage(
- `You have sent a request to ${receiver!.name}`,
- context.slackid
- );
- }
- console.log("slack message sent");
- });
-};
-
-let makeTeamRequest = async function (parent, args, context, info, req) {
- if (!context._id) {
- throw new Error("User not logged in");
- }
- let user = await User.findById(context._id);
- let team_id = args.team_id;
-
- let team = await Team.findById(team_id).populate('members');
-
- console.log("TEAM_ID: ", team_id);
- if (!user) {
- throw new Error("User not found!");
- }
- if (user.team) {
- throw new Error("You are already on a team!");
- }
- let notification = new Notification({
- bio: args.bio,
- idea: args.idea,
- senderType: "User",
- receiverType: "Team",
- sender: user._id,
- receiver: team_id,
- resolved: false,
- });
-
- return await notification.save((err, notif) => {
- if (err) {
- throw new Error("Error creating notification: " + notif);
- }
- Team.findByIdAndUpdate(team_id, {
- $push: {
- notifications: notif,
- },
- });
- let teamSlackIDs: any = [];
- team!.members.forEach((member) => {
- console.log(member.slackid)
- teamSlackIDs.push(member.slackid);
- console.log(member.slackid);
- });
- teamSlackIDs.forEach((id) => {
- sendSlackMessage(
- `You have received a request from ${context.name}. Accept or deny the request here: https://teamformation.hack.gt/team/${team_id}`,
- id
- );
- });
- sendSlackMessage(`You have sent a request to ${team!.name}`, user!.slackid);
- });
-};
-
-let getUserNotifications = async function (parent, args, context, info, req) {
- if (!context._id) {
- throw new Error("User not logged in");
- }
- return await Notification.find({
- receiverType: "User",
- receiver: context._id,
- resolved: false,
- }).populate("sender");
-};
-
-let getTeamNotifications = async function (parent, args, context, info, req) {
- if (!context._id) {
- throw new Error("User not logged in");
- }
- if (!context.team) {
- throw new Error("User not on a team");
- }
- return await Notification.find({
- receiverType: "Team",
- receiver: context.team,
- resolved: false,
- })
- .populate("sender")
- .populate("receiver");
-};
-
-// let createTeam = async function(args) {
-//
-// }
-
-let toggleVisibility = async function (parent, args, context, info, req) {
- return User.findByIdAndUpdate(
- context._id,
- { $bit: { visible: { xor: 1 } } },
- { new: true }
- );
-};
-
-let apiRouter = express.Router();
-
-const resolvers = {
- Source: {
- __resolveType(obj, context, info) {
- if (context.team) {
- return "User";
- }
- if (context._id) {
- return "Team";
- }
- return null;
- },
- },
- Query: {
- users: getUsers,
- user_profile: getUserProfile,
- teams: getTeams,
- team: getTeam,
- notifications: getUserNotifications,
- team_notifications: getTeamNotifications,
- sent_team_notifications: getSentTeamNotifications,
- user: getUser,
- },
- Mutation: {
- toggle_visibility: toggleVisibility,
- update_user: updateUser,
- update_team: updateTeam,
- accept_user_request: acceptUserRequest,
- accept_team_request: acceptTeamRequest,
- make_team_request: makeTeamRequest,
- make_user_request: makeUserRequest,
- leave_team: leaveTeam,
- },
-};
-
-apiRouter.use("/user", userRoutes);
-
-app.use("/api", apiRouter);
-
-const server = new ApolloServer({
- typeDefs,
- resolvers,
- context: ({ req }) => {
- return req.user;
- },
- playground: {
- settings: {
- "editor.theme": "dark",
- "request.credentials": "include",
- },
- },
-});
-
-server.applyMiddleware({ app });
-// app.use('/graphql', bodyParser.json(), graphqlExpress({ schema } as GraphQLServerOptions));
-//
-// app.use('/graphiql', graphiqlExpress({ endpointURL: '/graphql' }));
-
-app.use(express.static(path.join(__dirname, "../../client/build")));
-app.get("*", (request, response) => {
- response.sendFile(path.join(__dirname, "../../client/build", "index.html"));
-});
-
-app.listen(PORT, () => {
- console.log(
- `Team Formation system v${VERSION_NUMBER} started on port ${PORT}`
- );
-});
+import fs from "fs";
+import path from "path";
+import express from "express";
+import compression from "compression";
+import morgan from "morgan";
+
+import mongoose from "mongoose";
+import cors from "cors";
+import dotenv from "dotenv";
+const { ApolloServer } = require("apollo-server-express");
+import { userRoutes } from "./routes/user";
+import resolvers from "./resolvers";
+import typeDefs from "./typeDefs";
+
+
+dotenv.config();
+
+const PORT = 3000;
+const VERSION_NUMBER = JSON.parse(
+ fs.readFileSync(path.resolve(__dirname, "../package.json"), "utf8")
+).version;
+
+export let app = express();
+app.use(morgan("dev"));
+app.use(compression());
+app.use(cors());
+
+import schemaDirectives from "./directives"; // handles auth
+
+
+let apiRouter = express.Router();
+
+apiRouter.use("/user", userRoutes);
+app.use("/api", apiRouter);
+
+const server = new ApolloServer({
+ typeDefs,
+ resolvers,
+ schemaDirectives,
+ context: ({ req }) => {
+ return req.user;
+ },
+ playground: {
+ settings: {
+ "editor.theme": "dark",
+ "request.credentials": "include",
+ },
+ },
+});
+
+server.applyMiddleware({ app });
+
+app.use(express.static(path.join(__dirname, "../../client/build")));
+app.get("*", (request, response) => {
+ response.sendFile(path.join(__dirname, "../../client/build", "index.html"));
+});
+
+const MONGO_URL = String(process.env.MONGO_URL);
+
+(async () => {
+ await mongoose
+ .connect(MONGO_URL, {
+ useMongoClient: false,
+ })
+ .catch((err) => {
+ throw err;
+ });
+})();
+
+app.listen(PORT, () => {
+ console.log(
+ `Team Formation system v${VERSION_NUMBER} started on port ${PORT}`
+ );
+});
diff --git a/server/src/app2.ts b/server/src/app2.ts
new file mode 100644
index 00000000..4d8811ab
--- /dev/null
+++ b/server/src/app2.ts
@@ -0,0 +1,818 @@
+import fs from "fs";
+import path from "path";
+import express from "express";
+import compression from "compression";
+import morgan from "morgan";
+import passport from "passport";
+import session from "express-session";
+import mongoose from "mongoose";
+import cors from "cors";
+import dotenv from "dotenv";
+const { ApolloServer, gql } = require("apollo-server-express");
+import { GroundTruthStrategy } from "./routes/strategies";
+import { IUser, User, Notification, Team } from "./schema";
+import { userRoutes } from "./routes/user";
+import { sendSlackMessage } from "./utils";
+
+dotenv.config();
+
+const PORT = 3000;
+const typeDefs = gql`
+ ${fs.readFileSync(path.resolve(__dirname, "../api.graphql"), "utf8")}
+`;
+const VERSION_NUMBER = JSON.parse(
+ fs.readFileSync(path.resolve(__dirname, "../package.json"), "utf8")
+).version;
+//const VERSION_HASH = require("git-rev-sync").short();
+
+export let app = express();
+
+if (process.env.ISPRODUCTION === "true") {
+ app.enable("trust proxy");
+} else {
+ console.warn("OAuth callback(s) running in development mode");
+}
+
+app.use(morgan("dev"));
+app.use(compression());
+app.use(cors());
+const session_secret = process.env["SECRET"];
+if (!session_secret) {
+ throw new Error("Secret not specified");
+}
+app.use(
+ session({
+ secret: session_secret,
+ saveUninitialized: false,
+ resave: true,
+ })
+);
+
+app.use(passport.initialize());
+app.use(passport.session());
+
+export function loggedInErr(req, res, next) {
+ if (req.user) {
+ res.status(200).json({
+ success: true,
+ });
+ next();
+ } else {
+ res.status(401).json({ error: "User not logged in", success: false });
+ return;
+ }
+}
+
+const gturl = String(process.env.GROUNDTRUTHURL || "login.hack.gt");
+const groundTruthStrategy = new GroundTruthStrategy(gturl);
+passport.use(groundTruthStrategy);
+passport.serializeUser((user, done) => {
+ done(null, user.uuid);
+});
+passport.deserializeUser((id, done) => {
+ User.findOne({ uuid: id }, (err, user) => {
+ done(err, user!);
+ });
+});
+
+let getTeam = async function (parent, args, context, info, req) {
+ if (!context._id) {
+ throw new Error("User is not logged in!");
+ }
+ let team = await Team.findById(args.team_id).populate("members");
+ if (!team) {
+ throw new Error("Team not found!");
+ }
+ return team;
+};
+let getTeams = async function (parent, args, context, info, req) {
+ console.log("getting teams..");
+ let teams;
+ let search;
+ let interests;
+ let interestSearch = [] as {}[];
+
+ if (args.search) {
+ search = '"' + args.search.split(" ").join('" "') + '"';
+ }
+
+ if (args.interests) {
+ interests = args.interests.match(/\w+/g);
+ for (let i = 0; i < interests.length; i++) {
+ interestSearch.push({
+ interests: {
+ $elemMatch: { $regex: ".*" + interests[i] + ".*", $options: "i" },
+ },
+ });
+ }
+ }
+
+ if (search && interests) {
+ console.log("search and interest filters applied");
+ teams = await Team.find({
+ $and: [
+ { public: true },
+ { $text: { $search: search } },
+ { $and: interestSearch },
+ ],
+ }).populate("members");
+ } else if (search) {
+ console.log(`searching for ${search}..`);
+ teams = await Team.find({
+ $and: [{ public: true }, { $text: { $search: search } }],
+ }).populate("members");
+ } else if (interests) {
+ console.log(`interest filter(s) applied: ${interestSearch}`);
+ teams = await Team.find({
+ $and: [{ public: true }, { $and: interestSearch }],
+ }).populate("members");
+ } else {
+ console.log("no filter applied");
+ teams = await Team.find({
+ public: true,
+ }).populate("members");
+ }
+
+ if (!teams) {
+ return null;
+ }
+
+ teams.sort(function (a, b) {
+ return a.name.toLowerCase() - b.name.toLowerCase();
+ });
+ return teams;
+};
+
+let getUser = async function (parent, args, context, info, req) {
+ if (!context._id) {
+ throw new Error("User not logged in");
+ }
+ let user = await User.findById(args.user_id);
+ if (!user) {
+ throw new Error("User not found");
+ }
+ return user;
+};
+
+let getUsers = async function (parent, args, context, info, req) {
+ if (!context._id) {
+ throw new Error("User not logged in");
+ }
+ console.log("getting users..");
+ let users;
+ let search;
+ let skills;
+ let grad_years;
+ let schools;
+ let skillSearch = [] as {}[];
+ let yearSearch = [] as {}[];
+ let schoolSearch = [] as {}[];
+
+ if (args.search) {
+ search = '"' + args.search.split(" ").join('" "') + '"';
+ }
+ if (args.skill) {
+ skills = args.skill.match(/\w+/g);
+ for (let i = 0; i < skills.length; i++) {
+ skillSearch.push({
+ skills: {
+ $elemMatch: { $regex: ".*" + skills[i] + ".*", $options: "i" },
+ },
+ });
+ }
+ }
+ if (args.grad_year) {
+ grad_years = args.grad_year.match(/\w+/g);
+ for (let i = 0; i < grad_years.length; i++) {
+ yearSearch.push({ grad_year: grad_years[i] });
+ }
+ }
+ if (args.school) {
+ schools = args.school.split(",");
+ for (let i = 0; i < schools.length; i++) {
+ schoolSearch.push({ school: schools[i] });
+ }
+ }
+
+ if (search && skills && grad_years && schools) {
+ console.log("all filters applied...");
+ users = await User.find({
+ $and: [
+ { $text: { $search: search } },
+ { $and: skillSearch },
+ { $or: yearSearch },
+ { $or: schoolSearch },
+ ],
+ visible: 1
+ });
+ } else if (search && skills && grad_years) {
+ console.log("search, skills, and grad year filters applied...");
+ users = await User.find({
+ $and: [
+ { $text: { $search: search } },
+ { $and: skillSearch },
+ { $or: yearSearch },
+ ],
+ visible: 1
+ });
+ } else if (search && skills && schools) {
+ console.log("search, skills, and schools filters applied...");
+ users = await User.find({
+ $and: [
+ { $text: { $search: search } },
+ { $and: skillSearch },
+ { $or: schoolSearch },
+ ],
+ visible: 1
+ });
+ } else if (search && grad_years && schools) {
+ console.log("searc, grad year, and schools filters applied...");
+ users = await User.find({
+ $and: [
+ { $text: { $search: search } },
+ { $or: yearSearch },
+ { $or: schoolSearch },
+ ],
+ visible: 1
+ });
+ } else if (skills && grad_years && schools) {
+ console.log("skills, grad year, and schools filter applied...");
+ users = await User.find({
+ $and: [{ $and: skillSearch }, { $or: yearSearch }, { $or: schoolSearch }],visible: 1
+ }
+ );
+ } else if (search && skills) {
+ console.log("search and skills filters applied...");
+ users = await User.find({
+ $and: [{ $text: { $search: search } }, { $and: skillSearch }], visible: 1
+ });
+ } else if (search && grad_years) {
+ console.log("search and grad year filters applied...");
+ users = await User.find({
+ $and: [{ $text: { $search: search } }, { $or: yearSearch }], visible: 1
+ });
+ } else if (search && schools) {
+ console.log("search and schools filters applied...");
+ users = await User.find({
+ $and: [{ $text: { $search: search } }, { $or: schoolSearch }], visible: 1
+ });
+ } else if (skills && grad_years) {
+ console.log("skill and year filters applied");
+ users = await User.find({
+ $and: [{ $and: skillSearch }, { $or: yearSearch }], visible: 1
+ });
+ } else if (skills && schools) {
+ console.log("only skill and school filters applied");
+ users = await User.find({
+ $and: [{ $and: skillSearch }, { $or: schoolSearch }],visible: 1
+ });
+ } else if (grad_years && schools) {
+ console.log("only year and school filters applied");
+ users = await User.find({
+ $and: [{ $or: yearSearch }, { $or: schoolSearch }], visible: 1
+ });
+ } else if (search) {
+ console.log(`searching for ${search}..`);
+ users = await User.find({ $text: { $search: search }, visible: 1 });
+ console.log(users);
+ } else if (skills) {
+ console.log("only skill filter(s) applied");
+ users = await User.find({
+ $and: skillSearch, visible: 1
+ });
+ } else if (grad_years) {
+ console.log("only year filter(s) applied");
+ users = await User.find({
+ $or: yearSearch, visible: 1
+ });
+ } else if (schools) {
+ console.log("only school filter(s) applied");
+ users = await User.find({
+ $or: schoolSearch, visible: 1
+ });
+ } else {
+ console.log("no filters applied");
+ users = await User.find({visible: 1});
+ }
+
+ if (!users) {
+ return null;
+ }
+
+ users = users
+ .sort(function (a, b) {
+ return a.name.toLowerCase() - b.name.toLowerCase();
+ })
+ .filter((item) => {
+ return item.uuid != context.uuid && !item.team && item.visible == 1;
+ });
+ return users;
+};
+
+let updateUser = async function (parent, args, context, info, req) {
+ console.log(context._id);
+ if (!context._id) {
+ throw new Error("User not logged in");
+ }
+ return await User.findByIdAndUpdate(
+ context._id,
+ { $set: args },
+ { new: true }
+ );
+};
+
+let updateTeam = async function (parent, args, context, info, req) {
+ console.log(context._id);
+ if (!context._id) {
+ throw new Error("User not logged in");
+ }
+ let user = await User.findById(context._id).populate("team");
+ if (!user) {
+ throw new Error("User not found");
+ }
+ if (!user.team) {
+ throw new Error("User not on team");
+ }
+ return await Team.findByIdAndUpdate(user.team, { $set: args }, { new: true });
+};
+
+let leaveTeam = async function (parent, args, context, info, req) {
+ console.log("leaveing team");
+
+ if (!context._id) {
+ throw new Error("User not logged in");
+ }
+ if (!context.team) {
+ throw new Error("User not on team");
+ }
+
+ await Team.findByIdAndUpdate(
+ context.team,
+ {
+ $pull: {
+ members: context._id,
+ },
+ },
+ async (err, team) => {
+ if (err || !team) {
+ console.log(err);
+ throw new Error("Issue updating team");
+ }
+ console.log("TTTEAM", team);
+ if (team.members.length <= 1) {
+ await Team.findByIdAndDelete(context.team);
+ }
+ }
+ );
+
+ return await User.findByIdAndUpdate(context._id, {
+ team: null,
+ });
+};
+
+let getSentTeamNotifications = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+) {
+ if (!context._id) {
+ throw new Error("User not logged in");
+ }
+ let user = await User.findById(context._id);
+ if (!user) {
+ throw new Error("User not found");
+ }
+ if (!user.team) {
+ throw new Error("User not on teams");
+ }
+ return await Notification.find({
+ sender: user.team,
+ resolved: false,
+ }).populate("receiver");
+};
+
+let getUserProfile = async function (parent, args, context, info, req) {
+ return await User.findById(context._id).populate("team");
+};
+
+/*
+ Accepting a user sending request to team
+ */
+let acceptTeamRequest = async function (parent, args, context, info, req) {
+ if (!context._id) {
+ throw new Error("User not logged in");
+ }
+ let user = await User.findById(context._id).populate("team");
+ if (!user) {
+ throw new Error("User not found");
+ }
+ if (!user.team) {
+ throw new Error("User not on team");
+ }
+ if (user.team.members.length >= 4) {
+ throw new Error("Team is full");
+ }
+ let notification = await Notification.findById(args.notification_id)
+ .populate("sender")
+ .populate("receiver");
+ if (!notification) {
+ throw new Error("Notification does not exist");
+ }
+ if (notification.senderType == "Team") {
+ throw new Error("Cannot accept request from a team");
+ }
+ if (notification.senderType == "User") {
+ console.log(
+ "TEAM",
+ user.team._id.toString(),
+ notification.receiver._id.toString()
+ );
+
+ if (user.team._id.toString() !== notification.receiver._id.toString()) {
+ throw new Error("Team does not own notification");
+ }
+ let requestUser = await User.findById(notification.sender._id);
+ if (!requestUser) {
+ throw new Error("Notificaton sender not found");
+ }
+ if (requestUser.team) {
+ throw new Error("Sender already on team");
+ }
+ console.log("here2");
+
+ let requestedUserId = requestUser._id;
+ console.log(requestedUserId);
+ console.log(user.team._id);
+ console.log(mongoose.Types.ObjectId.isValid(requestedUserId));
+ console.log(mongoose.Types.ObjectId.isValid(user.team._id));
+
+ await Team.findByIdAndUpdate(
+ user.team._id,
+ {
+ $push: {
+ members: requestedUserId,
+ },
+ },
+ function (err, user) {
+ console.log("here");
+ console.log(err);
+ }
+ );
+ await User.findByIdAndUpdate(notification.sender._id, {
+ team: user.team._id,
+ });
+ await Notification.updateMany({ sender: notification.sender._id, receiver: notification.receiver._id }, {
+ resolved: true,
+ });
+
+ sendSlackMessage(
+ `${
+ user!.team!.name
+ } has accepted your request. View your new team here: https://teamformation.hack.gt/team/${user.team._id}`,
+ requestUser.slackid
+ );
+ console.log("slack message sent");
+ } else {
+ throw new Error("Notification invalid");
+ }
+};
+
+let acceptUserRequest = async function (parent, args, context, info, req) {
+ if (!context._id) {
+ throw new Error("User not logged in");
+ }
+ let user = await User.findById(context._id);
+ if (!user) {
+ throw new Error("User not found");
+ }
+
+ let notification = await Notification.findById(args.notification_id)
+ .populate("sender")
+ .populate("receiver");
+ if (!notification) {
+ throw new Error("Notification not found");
+ }
+ console.log("ACCEPT USER REQUEST");
+ console.log(notification.receiver._id);
+ console.log(user._id);
+
+ if (notification.receiver._id.toString() != user._id.toString()) {
+ throw new Error("Notification not valid");
+ }
+ await Notification.findByIdAndUpdate(notification._id, {
+ resolved: true,
+ });
+ if (notification.senderType == "Team") {
+ if (user.team) {
+ throw new Error("User already on team");
+ }
+ if (!notification.sender) {
+ throw new Error("Team no longer exists");
+ }
+ if (notification.sender.members.length >= 4) {
+ throw new Error("Team is full");
+ }
+ let team = await Team.findByIdAndUpdate(notification.sender._id, {
+ $push: {
+ members: user,
+ },
+ }).populate("members");
+ await User.findByIdAndUpdate(context._id, {
+ team: notification.sender._id,
+ });
+ let teamSlackIDs: any = [];
+ team!.members.forEach((member) => {
+ teamSlackIDs.push(member.slackid);
+ });
+ var index = teamSlackIDs.indexOf(user.slackid);
+ if (index != -1) {
+ teamSlackIDs.splice(index, 1);
+ }
+ teamSlackIDs.forEach((id) => {
+ sendSlackMessage(
+ `${context.name} has accepted your request. View your team here: https://teamformation.hack.gt/feed`,
+ id
+ );
+ });
+ console.log("slack message sent");
+ return team;
+ } else if (notification.senderType == "User") {
+ let user1 = await User.findById(context._id);
+ let user2 = await User.findById(notification.sender);
+ console.log(user1 + " " + user2);
+ if (user1 && user2) {
+ if (user1.team) {
+ throw new Error("User already on a team!");
+ }
+ if (user2.team) {
+ throw new Error("Requesting user already on team");
+ }
+ var team = new Team({
+ name: "Team " + user1._id + "" + user2._id,
+ members: [user1, user2],
+ public: true,
+ });
+ return await team.save(function (err, team) {
+ if (err) {
+ console.log(err);
+ }
+ if (!user1) {
+ throw new Error("User1 not defined");
+ }
+ if (!user2) {
+ throw new Error("User2 not defined");
+ }
+ user1.team = team;
+ user2.team = team;
+ user1.save(function (err) {
+ if (err) {
+ console.log(err);
+ throw new Error(err);
+ }
+ });
+ user2.save(function (err) {
+ if (err) {
+ console.log(err);
+ throw new Error(err);
+ }
+ });
+ sendSlackMessage(
+ `${context.name} has accepted your request. View your team here: https://teamformation.hack.gt/feed`,
+ user2.slackid
+ );
+ console.log("slack message sent");
+ });
+ } else {
+ throw new Error("User not defined");
+ }
+ } else {
+ throw new Error("Notification invalid");
+ }
+};
+
+let makeUserRequest = async function (parent, args, context, info, req) {
+ if (!context._id) {
+ throw new Error("User not logged in");
+ }
+ let notification;
+ let receiver_id = args.user_id;
+ let receiver = await User.findById(receiver_id);
+ let senderName = context.name;
+ if (!receiver) {
+ throw new Error("Receiver user not found");
+ }
+ if (receiver.team) {
+ throw new Error("Requested user already on team");
+ }
+ if (!context.team) {
+ //if user is not on a team
+ notification = new Notification({
+ bio: args.bio,
+ idea: args.idea,
+ senderType: "User",
+ receiverType: "User",
+ sender: context._id,
+ receiver: receiver_id,
+ resolved: false,
+ });
+ } else {
+ let team = await Team.findById(context.team);
+ if (!team) {
+ throw new Error("Team not found");
+ }
+ notification = new Notification({
+ bio: args.bio,
+ idea: args.idea,
+ senderType: "Team",
+ receiverType: "User",
+ sender: team._id,
+ receiver: receiver_id,
+ resolved: false,
+ });
+ senderName = team.name;
+ }
+
+ return await notification.save((err, notif) => {
+ if (err) {
+ throw new Error("Error creating notification: " + notif);
+ }
+ User.findByIdAndUpdate(receiver_id, {
+ $push: {
+ notifications: notif,
+ },
+ });
+ sendSlackMessage(
+ `You have received a request from ${senderName}. Accept or deny the request here: https://teamformation.hack.gt/feed`,
+ receiver!.slackid
+ );
+ if (!context.team) {
+ sendSlackMessage(
+ `You have sent a request to ${receiver!.name}`,
+ context.slackid
+ );
+ }
+ console.log("slack message sent");
+ });
+};
+
+let makeTeamRequest = async function (parent, args, context, info, req) {
+ if (!context._id) {
+ throw new Error("User not logged in");
+ }
+ let user = await User.findById(context._id);
+ let team_id = args.team_id;
+
+ let team = await Team.findById(team_id).populate('members');
+
+ console.log("TEAM_ID: ", team_id);
+ if (!user) {
+ throw new Error("User not found!");
+ }
+ if (user.team) {
+ throw new Error("You are already on a team!");
+ }
+ let notification = new Notification({
+ bio: args.bio,
+ idea: args.idea,
+ senderType: "User",
+ receiverType: "Team",
+ sender: user._id,
+ receiver: team_id,
+ resolved: false,
+ });
+
+ return await notification.save((err, notif) => {
+ if (err) {
+ throw new Error("Error creating notification: " + notif);
+ }
+ Team.findByIdAndUpdate(team_id, {
+ $push: {
+ notifications: notif,
+ },
+ });
+ let teamSlackIDs: any = [];
+ team!.members.forEach((member) => {
+ console.log(member.slackid)
+ teamSlackIDs.push(member.slackid);
+ console.log(member.slackid);
+ });
+ teamSlackIDs.forEach((id) => {
+ sendSlackMessage(
+ `You have received a request from ${context.name}. Accept or deny the request here: https://teamformation.hack.gt/team/${team_id}`,
+ id
+ );
+ });
+ sendSlackMessage(`You have sent a request to ${team!.name}`, user!.slackid);
+ });
+};
+
+let getUserNotifications = async function (parent, args, context, info, req) {
+ if (!context._id) {
+ throw new Error("User not logged in");
+ }
+ return await Notification.find({
+ receiverType: "User",
+ receiver: context._id,
+ resolved: false,
+ }).populate("sender");
+};
+
+let getTeamNotifications = async function (parent, args, context, info, req) {
+ if (!context._id) {
+ throw new Error("User not logged in");
+ }
+ if (!context.team) {
+ throw new Error("User not on a team");
+ }
+ return await Notification.find({
+ receiverType: "Team",
+ receiver: context.team,
+ resolved: false,
+ })
+ .populate("sender")
+ .populate("receiver");
+};
+
+// let createTeam = async function(args) {
+//
+// }
+
+let toggleVisibility = async function (parent, args, context, info, req) {
+ return User.findByIdAndUpdate(
+ context._id,
+ { $bit: { visible: { xor: 1 } } },
+ { new: true }
+ );
+};
+
+let apiRouter = express.Router();
+
+const resolvers = {
+ Source: {
+ __resolveType(obj, context, info) {
+ if (context.team) {
+ return "User";
+ }
+ if (context._id) {
+ return "Team";
+ }
+ return null;
+ },
+ },
+ Query: {
+ users: getUsers,
+ user_profile: getUserProfile,
+ teams: getTeams,
+ team: getTeam,
+ notifications: getUserNotifications,
+ team_notifications: getTeamNotifications,
+ sent_team_notifications: getSentTeamNotifications,
+ user: getUser,
+ },
+ Mutation: {
+ toggle_visibility: toggleVisibility,
+ update_user: updateUser,
+ update_team: updateTeam,
+ accept_user_request: acceptUserRequest,
+ accept_team_request: acceptTeamRequest,
+ make_team_request: makeTeamRequest,
+ make_user_request: makeUserRequest,
+ leave_team: leaveTeam,
+ },
+};
+
+apiRouter.use("/user", userRoutes);
+
+app.use("/api", apiRouter);
+
+const server = new ApolloServer({
+ typeDefs,
+ resolvers,
+ context: ({ req }) => {
+ return req.user;
+ },
+ playground: {
+ settings: {
+ "editor.theme": "dark",
+ "request.credentials": "include",
+ },
+ },
+});
+
+server.applyMiddleware({ app });
+// app.use('/graphql', bodyParser.json(), graphqlExpress({ schema } as GraphQLServerOptions));
+//
+// app.use('/graphiql', graphiqlExpress({ endpointURL: '/graphql' }));
+
+app.use(express.static(path.join(__dirname, "../../client/build")));
+app.get("*", (request, response) => {
+ response.sendFile(path.join(__dirname, "../../client/build", "index.html"));
+});
+
+app.listen(PORT, () => {
+ console.log(
+ `Team Formation system v${VERSION_NUMBER} started on port ${PORT}`
+ );
+});
diff --git a/server/src/auth.ts b/server/src/auth.ts
new file mode 100644
index 00000000..938bf3e0
--- /dev/null
+++ b/server/src/auth.ts
@@ -0,0 +1,42 @@
+
+const { AuthenticationError } = require("apollo-server-express");
+import { app } from './app'
+import passport from "passport";
+import session from "express-session";
+import { GroundTruthStrategy } from "./routes/strategies";
+import User from "./models/user";
+import { IUser } from "./types/user";
+
+const session_secret = process.env["SECRET"];
+if (!session_secret) {
+ throw new Error("Secret not specified");
+}
+
+app.use(
+ session({
+ secret: session_secret,
+ saveUninitialized: false,
+ resave: true,
+ })
+);
+
+app.use(passport.initialize());
+app.use(passport.session());
+
+const gturl = String(process.env.GROUNDTRUTHURL || "login.hack.gt");
+const groundTruthStrategy = new GroundTruthStrategy(gturl);
+passport.use(groundTruthStrategy);
+passport.serializeUser((user, done) => {
+ done(null, user.uuid);
+});
+passport.deserializeUser((id, done) => {
+ User.findOne({ uuid: id }, (err, user) => {
+ done(err, user!);
+ });
+});
+
+export const ensureSignedIn = (context): void => {
+ if (!context._id) { // check if user's id exists
+ throw new AuthenticationError("You must be signed in.");
+ }
+};
diff --git a/server/src/directives/auth.ts b/server/src/directives/auth.ts
new file mode 100644
index 00000000..b5dc2acf
--- /dev/null
+++ b/server/src/directives/auth.ts
@@ -0,0 +1,20 @@
+// import { SchemaDirectiveVisitor } from 'apollo-server-express'
+const { SchemaDirectiveVisitor } = require("apollo-server-express");
+import { GraphQLField, defaultFieldResolver } from "graphql";
+import { ensureSignedIn } from "../auth";
+
+class AuthDirective extends SchemaDirectiveVisitor {
+ public visitFieldDefinition(field: GraphQLField) {
+ const { resolve = defaultFieldResolver } = field;
+
+ field.resolve = function (...args) {
+ const [, , context] = args;
+
+ ensureSignedIn(context);
+
+ return resolve.apply(this, args);
+ };
+ }
+}
+
+export default AuthDirective;
diff --git a/server/src/directives/index.ts b/server/src/directives/index.ts
new file mode 100644
index 00000000..0d9e083d
--- /dev/null
+++ b/server/src/directives/index.ts
@@ -0,0 +1,5 @@
+import AuthDirective from './auth';
+
+export default {
+ auth: AuthDirective
+}
\ No newline at end of file
diff --git a/server/src/models/index.ts b/server/src/models/index.ts
new file mode 100644
index 00000000..a218d4db
--- /dev/null
+++ b/server/src/models/index.ts
@@ -0,0 +1,6 @@
+
+export { default as User } from './user'
+
+export { default as Team } from './team'
+
+export { default as Notification } from './notification'
\ No newline at end of file
diff --git a/server/src/models/notification.ts b/server/src/models/notification.ts
new file mode 100644
index 00000000..02c0f267
--- /dev/null
+++ b/server/src/models/notification.ts
@@ -0,0 +1,32 @@
+import { model, Schema } from 'mongoose'
+import { INotificationMongoose } from '../types'
+
+const Notification = model("Notification", new Schema({
+ message: String,
+ bio: String,
+ idea: String,
+ senderType: {
+ type: String,
+ required: true,
+ enum: ['Team', 'User']
+ },
+ receiverType: {
+ type: String,
+ required: true,
+ enum: ['Team', 'User']
+ },
+ sender: {
+ type: Schema.Types.ObjectId,
+ required: true,
+ refPath: 'senderType'
+ },
+ receiver: {
+ type: Schema.Types.ObjectId,
+ required: true,
+ refPath: 'receiverType'
+ },
+ resolved: Boolean
+}));
+
+export default Notification
+
diff --git a/server/src/models/team.ts b/server/src/models/team.ts
new file mode 100644
index 00000000..8415cc96
--- /dev/null
+++ b/server/src/models/team.ts
@@ -0,0 +1,43 @@
+import { model, Schema } from 'mongoose'
+import { ITeamMongoose } from '../types'
+
+const TeamSchema = new Schema({
+ name: {
+ required: true,
+ type: String,
+ unique: true
+ },
+ picture: String,
+ members: {
+ required: true,
+ type: [{
+ type: Schema.Types.ObjectId,
+ ref: "User"
+ }]
+ },
+ interests: [String],
+ description: String,
+ project_idea: String,
+ notifications: {
+ type: [{
+ type: Schema.Types.ObjectId,
+ ref: "Notification"
+ }]
+ },
+ public: Boolean
+ },
+ {
+ usePushEach: true
+ }
+);
+
+TeamSchema.index({
+ name: 'text',
+ members: 'text',
+ interests: 'text',
+ description: 'text'
+})
+
+const Team = model("Team", TeamSchema);
+
+export default Team
\ No newline at end of file
diff --git a/server/src/models/user.ts b/server/src/models/user.ts
new file mode 100644
index 00000000..50bce7a7
--- /dev/null
+++ b/server/src/models/user.ts
@@ -0,0 +1,55 @@
+import { model, Schema } from 'mongoose'
+import { IUserMongoose } from '../types'
+
+const UserSchema = new Schema({
+ uuid: {
+ type: String,
+ required: true,
+ index: true,
+ unique: true
+ },
+ email: {
+ type: String,
+ required: true,
+ unique: true
+ },
+ name: {
+ type: String,
+ required: false
+ },
+ school: {
+ type: String,
+ required: false
+ },
+ token: String,
+ grad_year: String,
+ skills: [String],
+ beginner: {
+ type: Boolean,
+ required: false
+ },
+ experience: String,
+ image: String,
+ auth_keys: [String],
+ admin: Boolean,
+ contact: String,
+ contact_method: String,
+ visible: Number,
+ team: {
+ type: Schema.Types.ObjectId,
+ ref: "Team"
+ },
+ slackid: String
+});
+
+UserSchema.index({
+ name: 'text',
+ school: 'text',
+ grad_year: 'text',
+ skills: 'text',
+ experience: 'text'
+});
+
+const User = model("User", UserSchema);
+
+export default User
\ No newline at end of file
diff --git a/server/src/resolvers/index.ts b/server/src/resolvers/index.ts
new file mode 100644
index 00000000..6b7ebcfb
--- /dev/null
+++ b/server/src/resolvers/index.ts
@@ -0,0 +1,6 @@
+import user from './user';
+import team from './team';
+import notification from './notification';
+import source from './source'
+
+export default [source, user, team, notification]
\ No newline at end of file
diff --git a/server/src/resolvers/notification/index.ts b/server/src/resolvers/notification/index.ts
new file mode 100644
index 00000000..ab4cdcf8
--- /dev/null
+++ b/server/src/resolvers/notification/index.ts
@@ -0,0 +1,23 @@
+import {
+ acceptTeamRequest,
+ makeTeamRequest,
+ acceptUserRequest,
+ makeUserRequest,
+} from "./mutations";
+
+import { getTeamNotifications, getUserNotifications } from "./queries";
+
+const resolvers = {
+ Query: {
+ team_notifications: getTeamNotifications,
+ notifications: getUserNotifications,
+ },
+ Mutation: {
+ accept_user_request: acceptUserRequest,
+ accept_team_request: acceptTeamRequest,
+ make_team_request: makeTeamRequest,
+ make_user_request: makeUserRequest,
+ }
+};
+
+export default resolvers;
diff --git a/server/src/resolvers/notification/mutations/acceptTeamRequest.ts b/server/src/resolvers/notification/mutations/acceptTeamRequest.ts
new file mode 100644
index 00000000..8de50cbf
--- /dev/null
+++ b/server/src/resolvers/notification/mutations/acceptTeamRequest.ts
@@ -0,0 +1,87 @@
+import { Team, User, Notification } from "../../../models";
+import {
+ IUserMongoose,
+ INotificationMongoose,
+} from "../../../types";
+import { GraphQLError } from "graphql";
+import { sendSlackMessage } from "../../../utils";
+
+const acceptTeamRequest = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ let user: IUserMongoose | null = await User.findById(context._id).populate(
+ "team"
+ );
+ if (!user) {
+ throw new GraphQLError("User not found");
+ }
+ if (!user.team) {
+ throw new GraphQLError("User not on team");
+ }
+ if (user.team.members.length >= 4) {
+ throw new GraphQLError("Team is full");
+ }
+ let notification = await Notification.findById(args.notification_id)
+ .populate("sender")
+ .populate("receiver");
+ if (!notification) {
+ throw new GraphQLError("Notification does not exist");
+ }
+ if (notification.senderType == "Team") {
+ throw new GraphQLError("Cannot accept request from a team");
+ }
+ if (notification.senderType == "User") {
+ if (user.team._id.toString() !== notification.receiver._id.toString()) {
+ throw new GraphQLError("Team does not own notification");
+ }
+ let requestUser = await User.findById(notification.sender._id);
+ if (!requestUser) {
+ throw new GraphQLError("Notificaton sender not found");
+ }
+ if (requestUser.team) {
+ throw new GraphQLError("Sender already on team");
+ }
+
+ let requestedUserId = requestUser._id;
+
+ await Team.findByIdAndUpdate(
+ user.team._id,
+ {
+ $push: {
+ members: requestedUserId,
+ },
+ },
+ function (err, user) {
+ throw new GraphQLError(err);
+ }
+ );
+ await User.findByIdAndUpdate(notification.sender._id, {
+ team: user.team._id,
+ });
+
+ await Notification.updateMany(
+ { sender: notification.sender._id, receiver: notification.receiver._id },
+ {
+ resolved: true,
+ }
+ );
+
+ sendSlackMessage(
+ `${
+ user!.team!.name
+ } has accepted your request. View your new team here: https://teamformation.hack.gt/team/${
+ user.team._id
+ }`,
+ requestUser.slackid
+ );
+ return notification;
+ } else {
+ throw new Error("Notification invalid");
+ }
+};
+
+export default acceptTeamRequest;
diff --git a/server/src/resolvers/notification/mutations/acceptUserRequest.ts b/server/src/resolvers/notification/mutations/acceptUserRequest.ts
new file mode 100644
index 00000000..d4505461
--- /dev/null
+++ b/server/src/resolvers/notification/mutations/acceptUserRequest.ts
@@ -0,0 +1,131 @@
+import { Team, User, Notification } from "../../../models";
+import {
+ IUserMongoose,
+ ITeamMongoose,
+ INotificationMongoose,
+} from "../../../types";
+import { GraphQLError } from "graphql";
+import { sendSlackMessage } from "../../../utils";
+
+const acceptUserRequest = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ let user = await User.findById(context._id);
+ if (!user) {
+ throw new Error("User not found");
+ }
+
+ let notification: INotificationMongoose | null = await Notification.findById(
+ args.notification_id
+ )
+ .populate("sender")
+ .populate("receiver");
+ if (!notification) {
+ throw new GraphQLError("Notification not found");
+ }
+
+ if (notification.receiver._id.toString() != user._id.toString()) {
+ throw new GraphQLError("Notification not valid");
+ }
+ await Notification.findByIdAndUpdate(notification._id, {
+ resolved: true,
+ });
+ if (notification.senderType == "Team") {
+ if (user.team) {
+ throw new GraphQLError("User already on team");
+ }
+ if (!notification.sender) {
+ throw new GraphQLError("Team no longer exists");
+ }
+ if (notification.sender.members.length >= 4) {
+ throw new GraphQLError("Team is full");
+ }
+ let team = await Team.findByIdAndUpdate(notification.sender._id, {
+ $push: {
+ members: user,
+ },
+ }).populate("members");
+
+ await User.findByIdAndUpdate(context._id, {
+ team: notification.sender._id,
+ });
+
+ let teamSlackIDs: any = [];
+ team!.members.forEach((member) => {
+ teamSlackIDs.push(member.slackid);
+ });
+
+ var index = teamSlackIDs.indexOf(user.slackid);
+ if (index != -1) {
+ teamSlackIDs.splice(index, 1);
+ }
+ teamSlackIDs.forEach((id) => {
+ sendSlackMessage(
+ `${context.name} has accepted your request. View your team here: https://teamformation.hack.gt/feed`,
+ id
+ );
+ });
+ return team;
+ } else if (notification.senderType == "User") {
+ let user1: IUserMongoose | null = await User.findById(context._id);
+ let user2: IUserMongoose | null = await User.findById(notification.sender);
+ if (user1 && user2) {
+ if (user1.team) {
+ throw new Error("User already on a team!");
+ }
+ if (user2.team) {
+ throw new Error("Requesting user already on team");
+ }
+ var team: ITeamMongoose = new Team({
+ name: "Team " + user1._id + "" + user2._id,
+ members: [user1, user2],
+ public: true,
+ });
+
+ if(!team) {
+ throw new GraphQLError("Error creatiing team object");
+ }
+
+ return await team.save(function (err, team) {
+ if (err) {
+ console.log(err);
+ }
+ if (!user1) {
+ throw new Error("User1 not defined");
+ }
+ if (!user2) {
+ throw new Error("User2 not defined");
+ }
+ user1.team = team;
+ user2.team = team;
+ user1.save(function (err) {
+ if (err) {
+ console.log(err);
+ throw new GraphQLError(err);
+ }
+ });
+ user2.save(function (err) {
+ if (err) {
+ console.log(err);
+ throw new GraphQLError(err);
+ }
+ });
+ sendSlackMessage(
+ `${context.name} has accepted your request. View your team here: https://teamformation.hack.gt/feed`,
+ user2.slackid
+ );
+ console.log("slack message sent");
+ });
+ } else {
+ throw new GraphQLError("User not defined");
+ }
+ } else {
+ throw new GraphQLError("Notification invalid");
+ }
+};
+
+export default acceptUserRequest;
diff --git a/server/src/resolvers/notification/mutations/index.ts b/server/src/resolvers/notification/mutations/index.ts
new file mode 100644
index 00000000..a336c4c9
--- /dev/null
+++ b/server/src/resolvers/notification/mutations/index.ts
@@ -0,0 +1,7 @@
+export { default as acceptTeamRequest } from './acceptTeamRequest'
+
+export { default as acceptUserRequest } from './acceptUserRequest'
+
+export { default as makeTeamRequest } from './makeTeamRequest'
+
+export { default as makeUserRequest } from './makeUserRequest'
diff --git a/server/src/resolvers/notification/mutations/makeTeamRequest.ts b/server/src/resolvers/notification/mutations/makeTeamRequest.ts
new file mode 100644
index 00000000..d973a425
--- /dev/null
+++ b/server/src/resolvers/notification/mutations/makeTeamRequest.ts
@@ -0,0 +1,69 @@
+import { Team, User, Notification } from "../../../models";
+import {
+ IUserMongoose,
+ ITeamMongoose,
+ INotificationMongoose,
+} from "../../../types";
+import { GraphQLError } from "graphql";
+import { sendSlackMessage } from "../../../utils";
+
+const makeTeamRequest = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ let user: IUserMongoose | null = await User.findById(context._id);
+ let team_id = args.team_id;
+
+ let team: ITeamMongoose | null = await Team.findById(team_id).populate(
+ "members"
+ );
+
+ if (!user) {
+ throw new GraphQLError("User not found!");
+ }
+ if (user.team) {
+ throw new GraphQLError("You are already on a team!");
+ }
+ let notification: INotificationMongoose = new Notification({
+ bio: args.bio,
+ idea: args.idea,
+ senderType: "User",
+ receiverType: "Team",
+ sender: user._id,
+ receiver: team_id,
+ resolved: false,
+ });
+
+ if(!notification) {
+ throw new GraphQLError("Error creating notification object");
+ }
+
+ return await notification.save((err, notif) => {
+ if (err) {
+ throw new GraphQLError("Error creating notification: " + notif);
+ }
+ Team.findByIdAndUpdate(team_id, {
+ $push: {
+ notifications: notif,
+ },
+ });
+ let teamSlackIDs: any = [];
+ team!.members.forEach((member) => {
+ console.log(member.slackid);
+ teamSlackIDs.push(member.slackid);
+ console.log(member.slackid);
+ });
+ teamSlackIDs.forEach((id) => {
+ sendSlackMessage(
+ `You have received a request from ${context.name}. Accept or deny the request here: https://teamformation.hack.gt/team/${team_id}`,
+ id
+ );
+ });
+ sendSlackMessage(`You have sent a request to ${team!.name}`, user!.slackid);
+ });
+};
+
+export default makeTeamRequest;
diff --git a/server/src/resolvers/notification/mutations/makeUserRequest.ts b/server/src/resolvers/notification/mutations/makeUserRequest.ts
new file mode 100644
index 00000000..9b5bfe92
--- /dev/null
+++ b/server/src/resolvers/notification/mutations/makeUserRequest.ts
@@ -0,0 +1,81 @@
+import { Team, User, Notification } from "../../../models";
+import {
+ IUserMongoose,
+ INotificationMongoose,
+ ITeamMongoose,
+} from "../../../types";
+import { GraphQLError } from "graphql";
+import { sendSlackMessage } from "../../../utils";
+
+const makeUserRequest = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ let notification: INotificationMongoose;
+ let receiver_id = args.user_id;
+ let receiver: IUserMongoose | null = await User.findById(receiver_id);
+ let senderName = context.name;
+ if (!receiver) {
+ throw new GraphQLError("Receiver user not found");
+ }
+ if (receiver.team) {
+ throw new GraphQLError("Requested user already on team");
+ }
+ if (!context.team) {
+ //if user is not on a team
+ notification = new Notification({
+ bio: args.bio,
+ idea: args.idea,
+ senderType: "User",
+ receiverType: "User",
+ sender: context._id,
+ receiver: receiver_id,
+ resolved: false,
+ });
+ } else {
+ let team: ITeamMongoose | null = await Team.findById(context.team);
+ if (!team) {
+ throw new GraphQLError("Team not found");
+ }
+ notification = new Notification({
+ bio: args.bio,
+ idea: args.idea,
+ senderType: "Team",
+ receiverType: "User",
+ sender: team._id,
+ receiver: receiver_id,
+ resolved: false,
+ });
+ senderName = team.name;
+ }
+
+ if(!notification) {
+ throw new GraphQLError("Error creating notification object");
+ }
+
+ return await notification.save((err, notif) => {
+ if (err) {
+ throw new GraphQLError("Error creating notification: " + notif);
+ }
+ User.findByIdAndUpdate(receiver_id, {
+ $push: {
+ notifications: notif,
+ },
+ });
+ sendSlackMessage(
+ `You have received a request from ${senderName}. Accept or deny the request here: https://teamformation.hack.gt/feed`,
+ receiver!.slackid
+ );
+ if (!context.team) {
+ sendSlackMessage(
+ `You have sent a request to ${receiver!.name}`,
+ context.slackid
+ );
+ }
+ });
+};
+
+export default makeUserRequest;
diff --git a/server/src/resolvers/notification/queries/getTeamNotifications.ts b/server/src/resolvers/notification/queries/getTeamNotifications.ts
new file mode 100644
index 00000000..6b1f700a
--- /dev/null
+++ b/server/src/resolvers/notification/queries/getTeamNotifications.ts
@@ -0,0 +1,30 @@
+import { Notification } from "../../../models";
+import { GraphQLError } from "graphql";
+import { INotificationMongoose } from "../../../types";
+
+const getTeamNotifications = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ if (!context.team) {
+ throw new GraphQLError("User not on a team");
+ }
+
+ if (args.sent) {
+ return await Notification.find({
+ sender: context.team,
+ resolved: false,
+ }).populate("receiver");
+ }
+
+ return await Notification.find({
+ receiverType: "Team",
+ receiver: context.team,
+ resolved: false,
+ }).populate("sender");
+};
+
+export default getTeamNotifications;
diff --git a/server/src/resolvers/notification/queries/getUserNotifications.ts b/server/src/resolvers/notification/queries/getUserNotifications.ts
new file mode 100644
index 00000000..602a2484
--- /dev/null
+++ b/server/src/resolvers/notification/queries/getUserNotifications.ts
@@ -0,0 +1,18 @@
+import { Notification } from "../../../models";
+import { INotificationMongoose } from "../../../types";
+
+const getUserNotifications = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ return await Notification.find({
+ receiverType: "User",
+ receiver: context._id,
+ resolved: false,
+ }).populate("sender");
+};
+
+export default getUserNotifications;
diff --git a/server/src/resolvers/notification/queries/index.ts b/server/src/resolvers/notification/queries/index.ts
new file mode 100644
index 00000000..7bb4979b
--- /dev/null
+++ b/server/src/resolvers/notification/queries/index.ts
@@ -0,0 +1,3 @@
+export { default as getTeamNotifications } from './getTeamNotifications'
+
+export { default as getUserNotifications } from './getUserNotifications'
\ No newline at end of file
diff --git a/server/src/resolvers/source/index.ts b/server/src/resolvers/source/index.ts
new file mode 100644
index 00000000..978cb8ee
--- /dev/null
+++ b/server/src/resolvers/source/index.ts
@@ -0,0 +1,15 @@
+const resolvers = {
+ Source: {
+ __resolveType(obj, context, info) {
+ if (context.team) {
+ return "User";
+ }
+ if (context._id) {
+ return "Team";
+ }
+ return null;
+ },
+ },
+};
+
+export default resolvers;
diff --git a/server/src/resolvers/team/index.ts b/server/src/resolvers/team/index.ts
new file mode 100644
index 00000000..f106f586
--- /dev/null
+++ b/server/src/resolvers/team/index.ts
@@ -0,0 +1,15 @@
+import { updateTeam, leaveTeam } from './mutations'
+import { getTeam, getTeams } from './queries';
+
+const resolvers = {
+ Query: {
+ teams: getTeams,
+ team: getTeam
+ },
+ Mutation: {
+ update_team: updateTeam,
+ leave_team: leaveTeam
+ }
+}
+
+export default resolvers
\ No newline at end of file
diff --git a/server/src/resolvers/team/mutations/index.ts b/server/src/resolvers/team/mutations/index.ts
new file mode 100644
index 00000000..f34df412
--- /dev/null
+++ b/server/src/resolvers/team/mutations/index.ts
@@ -0,0 +1,3 @@
+export { default as updateTeam } from './updateTeam'
+
+export { default as leaveTeam } from './leaveTeam'
diff --git a/server/src/resolvers/team/mutations/leaveTeam.ts b/server/src/resolvers/team/mutations/leaveTeam.ts
new file mode 100644
index 00000000..f28a0ce6
--- /dev/null
+++ b/server/src/resolvers/team/mutations/leaveTeam.ts
@@ -0,0 +1,38 @@
+import { Team, User } from "../../../models";
+import { GraphQLError } from "graphql";
+import { IUserMongoose } from "../../../types";
+
+const leaveTeam = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ if (!context.team) {
+ throw new GraphQLError("User not on team");
+ }
+
+ await Team.findByIdAndUpdate(
+ context.team,
+ {
+ $pull: {
+ members: context._id,
+ },
+ },
+ async (err, team) => {
+ if (err || !team) {
+ throw new GraphQLError("Issue updating team");
+ }
+ if (team.members.length <= 1) {
+ await Team.findByIdAndDelete(context.team);
+ }
+ }
+ );
+
+ return await User.findByIdAndUpdate(context._id, {
+ team: null,
+ });
+};
+
+export default leaveTeam;
diff --git a/server/src/resolvers/team/mutations/updateTeam.ts b/server/src/resolvers/team/mutations/updateTeam.ts
new file mode 100644
index 00000000..a4626e90
--- /dev/null
+++ b/server/src/resolvers/team/mutations/updateTeam.ts
@@ -0,0 +1,23 @@
+import { Team, User } from "../../../models";
+import { IUserMongoose, ITeamMongoose } from "../../../types";
+
+const updateTeam = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ let user: IUserMongoose | null = await User.findById(context._id).populate(
+ "team"
+ );
+ if (!user) {
+ throw new Error("User not found");
+ }
+ if (!user.team) {
+ throw new Error("User not on team");
+ }
+ return await Team.findByIdAndUpdate(user.team, { $set: args }, { new: true });
+}; // consider taking in team-id instead of automatically using logged in user's team id
+
+export default updateTeam;
diff --git a/server/src/resolvers/team/queries/getTeam.ts b/server/src/resolvers/team/queries/getTeam.ts
new file mode 100644
index 00000000..6b6d5731
--- /dev/null
+++ b/server/src/resolvers/team/queries/getTeam.ts
@@ -0,0 +1,21 @@
+import { Team } from "../../../models";
+import { GraphQLError } from "graphql";
+import { ITeamMongoose } from "../../../types";
+
+const getTeam = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ let team: ITeamMongoose | null = await Team.findById(args.team_id).populate(
+ "members"
+ );
+ if (!team) {
+ throw new GraphQLError("Team not found!");
+ }
+ return team;
+};
+
+export default getTeam;
diff --git a/server/src/resolvers/team/queries/getTeams.ts b/server/src/resolvers/team/queries/getTeams.ts
new file mode 100644
index 00000000..adea64bf
--- /dev/null
+++ b/server/src/resolvers/team/queries/getTeams.ts
@@ -0,0 +1,44 @@
+import { Team } from "../../../models";
+import { ITeamMongoose } from "../../../types";
+
+const getTeams = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ let teams: ITeamMongoose[];
+ let search: String;
+ let interests: String[];
+ let interestSearch = [] as {}[];
+ let andQuery = [] as {}[];
+ if (args.search) {
+ search = '"' + args.search.split(" ").join('" "') + '"';
+ andQuery.push({ $text: { $search: search } });
+ }
+
+ if (args.interests) {
+ interests = args.interests.match(/\w+/g);
+ interestSearch = interests.map((interest) => {
+ return {
+ interests: {
+ $elemMatch: { $regex: ".*" + interest + ".*", $options: "i" },
+ },
+ };
+ });
+ andQuery.push({ $and: interestSearch });
+ }
+
+ teams = await Team.find({
+ $and: [{ public: true }, ...andQuery],
+ }).populate("members");
+
+ teams.sort(function (a, b) {
+ return a.name.toLowerCase() < b.name.toLowerCase() ? 1 : -1;
+ });
+
+ return teams;
+};
+
+export default getTeams;
diff --git a/server/src/resolvers/team/queries/index.ts b/server/src/resolvers/team/queries/index.ts
new file mode 100644
index 00000000..bdfd7dde
--- /dev/null
+++ b/server/src/resolvers/team/queries/index.ts
@@ -0,0 +1,3 @@
+export { default as getTeam } from './getTeam'
+
+export { default as getTeams } from './getTeams'
diff --git a/server/src/resolvers/user/index.ts b/server/src/resolvers/user/index.ts
new file mode 100644
index 00000000..275a0170
--- /dev/null
+++ b/server/src/resolvers/user/index.ts
@@ -0,0 +1,15 @@
+import { updateUser } from './mutations'
+import { getUser, getUserProfile, getUsers } from './queries';
+
+const resolvers = {
+ Query: {
+ users: getUsers,
+ user_profile: getUserProfile,
+ user: getUser,
+ },
+ Mutation: {
+ update_user: updateUser,
+ }
+}
+
+export default resolvers
\ No newline at end of file
diff --git a/server/src/resolvers/user/mutations/index.ts b/server/src/resolvers/user/mutations/index.ts
new file mode 100644
index 00000000..de532ea1
--- /dev/null
+++ b/server/src/resolvers/user/mutations/index.ts
@@ -0,0 +1 @@
+export { default as updateUser } from './updateUser'
diff --git a/server/src/resolvers/user/mutations/updateUser.ts b/server/src/resolvers/user/mutations/updateUser.ts
new file mode 100644
index 00000000..a749cfed
--- /dev/null
+++ b/server/src/resolvers/user/mutations/updateUser.ts
@@ -0,0 +1,18 @@
+import { User } from "../../../models";
+import { IUserMongoose } from "../../../types";
+
+const updateUser = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ return await User.findByIdAndUpdate(
+ context._id,
+ { $set: args },
+ { new: true }
+ );
+};
+
+export default updateUser;
diff --git a/server/src/resolvers/user/queries/getUser.ts b/server/src/resolvers/user/queries/getUser.ts
new file mode 100644
index 00000000..14bbf1c0
--- /dev/null
+++ b/server/src/resolvers/user/queries/getUser.ts
@@ -0,0 +1,19 @@
+import { User } from "../../../models";
+import { IUserMongoose } from "../../../types";
+import { GraphQLError } from 'graphql';
+
+const getUser = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ let user = await User.findById(args.user_id);
+ if (!user) {
+ throw new GraphQLError("User not found");
+ }
+ return user;
+};
+
+export default getUser;
diff --git a/server/src/resolvers/user/queries/getUserProfile.ts b/server/src/resolvers/user/queries/getUserProfile.ts
new file mode 100644
index 00000000..49dc2756
--- /dev/null
+++ b/server/src/resolvers/user/queries/getUserProfile.ts
@@ -0,0 +1,14 @@
+import { User } from "../../../models";
+import { IUserMongoose } from "../../../types";
+
+const getUserProfile = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ return await User.findById(context._id).populate("team");
+};
+
+export default getUserProfile;
diff --git a/server/src/resolvers/user/queries/getUsers.ts b/server/src/resolvers/user/queries/getUsers.ts
new file mode 100644
index 00000000..7613bac6
--- /dev/null
+++ b/server/src/resolvers/user/queries/getUsers.ts
@@ -0,0 +1,72 @@
+import { IUserMongoose } from "../../../types";
+import { User } from "../../../models"
+
+const getUsers = async function (
+ parent,
+ args,
+ context,
+ info,
+ req
+): Promise {
+ let users: IUserMongoose[];
+ let search: String;
+ let skills: String[];
+ let grad_years: String[];
+ let schools: String[];
+ let skillSearch = [] as {}[];
+ let yearSearch = [] as {}[];
+ let schoolSearch = [] as {}[];
+
+ let andQuery = [] as any;
+ console.log(args)
+ if (args.search) {
+ search = '"' + args.search.split(" ").join('" "') + '"';
+ andQuery.push({ $text: { $search: search } });
+ }
+ if (args.skill) {
+ skills = args.skill.match(/\w+/g);
+ for (let i = 0; i < skills.length; i++) {
+ skillSearch.push({
+ skills: {
+ $elemMatch: { $regex: ".*" + skills[i] + ".*", $options: "i" },
+ },
+ });
+ }
+ andQuery.push({ $and: skillSearch });
+ }
+ if (args.grad_year) {
+ grad_years = args.grad_year.match(/\w+/g);
+ for (let i = 0; i < grad_years.length; i++) {
+ yearSearch.push({ grad_year: grad_years[i] });
+ }
+ andQuery.push({ $or: yearSearch });
+ }
+ if (args.school) {
+ schools = args.school.split(",");
+ for (let i = 0; i < schools.length; i++) {
+ schoolSearch.push({ school: schools[i] });
+ }
+ andQuery.push({ $or: schoolSearch });
+ }
+ console.log(andQuery)
+ if(andQuery.length > 0) {
+ users = await User.find({
+ $and: andQuery,
+ visible: 1,
+ });
+ } else {
+ users = await User.find({ visible: 1 });
+ }
+
+ users = users
+ .sort(function (a, b) {
+ return a.name.toLowerCase() < b.name.toLowerCase() ? 1 : -1;
+ })
+ .filter((item) => {
+ return item.uuid != context.uuid && !item.team && item.visible == 1;
+ });
+
+ return users;
+};
+
+export default getUsers;
diff --git a/server/src/resolvers/user/queries/index.ts b/server/src/resolvers/user/queries/index.ts
new file mode 100644
index 00000000..a0052d2f
--- /dev/null
+++ b/server/src/resolvers/user/queries/index.ts
@@ -0,0 +1,5 @@
+export { default as getUser } from './getUser'
+
+export { default as getUsers } from './getUsers'
+
+export { default as getUserProfile } from './getUserProfile'
diff --git a/server/src/routes/strategies.ts b/server/src/routes/strategies.ts
index f0582fff..ecc1527d 100644
--- a/server/src/routes/strategies.ts
+++ b/server/src/routes/strategies.ts
@@ -4,7 +4,9 @@ import { Strategy as OAuthStrategy } from "passport-oauth2";
import dotenv from "dotenv"
import request from "request"
import { Request } from "express";
-import { createNew, IUser, User } from "../schema";
+import { User } from "../models"
+import { createNew, IUser } from "../types";
+import mongoose from 'mongoose';
dotenv.config()
@@ -74,11 +76,14 @@ export class GroundTruthStrategy extends OAuthStrategy {
}
protected static async passportCallback(req: Request, accessToken: string, refreshToken: string, profile: IProfile, done: PassportDone) {
+ console.log(mongoose.connection.readyState);
+
console.log(profile)
+ console.log("hi")
let user = await User.findOne({ uuid: profile.uuid });
const GRAPHQLURL = process.env.GRAPHQLURL || 'https://registration.hack.gt/graphql'
-
+ console.log("82 here")
if (!user) {
let confirmed = false;
const query = `
@@ -110,6 +115,7 @@ export class GroundTruthStrategy extends OAuthStrategy {
if (JSON.parse(body).data.search_user.users.length > 0) {
confirmed = JSON.parse(body).data.search_user.users[0].confirmed;
}
+ console.log("requesting...")
if (!process.env.ISPRODUCTION || confirmed) {
console.log("here")
user = createNew(User, {
diff --git a/server/src/routes/user.ts b/server/src/routes/user.ts
index aee326a7..498cef2f 100644
--- a/server/src/routes/user.ts
+++ b/server/src/routes/user.ts
@@ -2,7 +2,8 @@ import express from "express";
import request from "request"
import passport from "passport";
import { createLink, AuthenticateOptions } from "./strategies"
-import { IUser, User } from "../schema";
+import { User } from "../models";
+import { IUser } from "../types";
export let userRoutes = express.Router();
userRoutes.route("/login").get((req, response, next) => {
diff --git a/server/src/typeDefs/index.ts b/server/src/typeDefs/index.ts
new file mode 100644
index 00000000..ec711a49
--- /dev/null
+++ b/server/src/typeDefs/index.ts
@@ -0,0 +1,6 @@
+import user from './user'
+import team from './team'
+import notification from './notification'
+import root from './root'
+
+export default [root, user, team, notification]
\ No newline at end of file
diff --git a/server/src/typeDefs/notification.ts b/server/src/typeDefs/notification.ts
new file mode 100644
index 00000000..4c98f395
--- /dev/null
+++ b/server/src/typeDefs/notification.ts
@@ -0,0 +1,28 @@
+const { gql } = require("apollo-server-express");
+
+export default gql`
+ extend type Query {
+ notifications(receiver_id: String): [Notification!]! @auth
+ team_notifications(sent: Boolean): [Notification]! @auth
+ }
+
+ extend type Mutation {
+ accept_team_request(notification_id: String): Team @auth
+ accept_user_request(notification_id: String): Team @auth
+ make_team_request(team_id: String, user_id: String, bio: String, idea: String): Notification @auth
+ make_user_request(user_id: String, bio: String, idea: String): Notification @auth
+ }
+
+ union Source = User | Team
+
+ type Notification {
+ id: ID
+ message: String
+ bio: String
+ idea: String
+ sender: Source
+ senderType: String
+ receiver: Source
+ resolved: Boolean
+ }
+`
\ No newline at end of file
diff --git a/server/src/typeDefs/root.ts b/server/src/typeDefs/root.ts
new file mode 100644
index 00000000..0d3d8b0a
--- /dev/null
+++ b/server/src/typeDefs/root.ts
@@ -0,0 +1,12 @@
+import { gql } from 'apollo-server-express'
+
+export default gql`
+ directive @auth on FIELD_DEFINITION
+
+ type Query {
+ _: String
+ }
+ type Mutation {
+ _: String
+ }
+`
\ No newline at end of file
diff --git a/server/src/typeDefs/team.ts b/server/src/typeDefs/team.ts
new file mode 100644
index 00000000..7ec4500e
--- /dev/null
+++ b/server/src/typeDefs/team.ts
@@ -0,0 +1,25 @@
+const { gql } = require("apollo-server-express");
+
+export default gql`
+ extend type Query {
+ teams(search: String, name: String, picture: String, team_id: String, interests: String, description: String, public: Boolean): [Team!]! @auth
+ team(team_id: String): Team! @auth
+ }
+
+ extend type Mutation {
+ update_team(name: String, picture: String, interests: [String], description: String, public: Boolean, project_idea: String): Team @auth
+ leave_team: User @auth
+ }
+
+ type Team {
+ id: ID!
+ name: String!
+ picture: String
+ members: [User!]
+ interests: [String!]
+ description: String
+ project_idea: String
+ notifications: [Notification!]!
+ public: Boolean
+ }
+`
\ No newline at end of file
diff --git a/server/src/typeDefs/user.ts b/server/src/typeDefs/user.ts
new file mode 100644
index 00000000..3ac27ad3
--- /dev/null
+++ b/server/src/typeDefs/user.ts
@@ -0,0 +1,30 @@
+const { gql } = require("apollo-server-express");
+
+export default gql`
+ extend type Query {
+ users(search: String, skill: String, name: String, email: String, grad_year: String, school: String, visible: Int): [User!]! @auth
+ user(user_id: String): User! @auth
+ user_profile: User! @auth
+ }
+
+ extend type Mutation {
+ update_user(name: String email: String, grad_year: String, school: String, contact: String, skills: [String], experience: String, contact_method: String, visible: Int): User! @auth
+ }
+
+ type User {
+ id: ID!
+ uuid: String
+ name: String!
+ email: String!
+ school: String
+ grad_year: String
+ beginner: Boolean
+ skills: [String!]
+ experience: String
+ contact: String
+ contact_method: String
+ visible: Int
+ team: Team
+ slackid: String
+ }
+`
\ No newline at end of file
diff --git a/server/src/types/index.ts b/server/src/types/index.ts
new file mode 100644
index 00000000..95fdde9d
--- /dev/null
+++ b/server/src/types/index.ts
@@ -0,0 +1,7 @@
+export * from './notification'
+
+export * from './mongoose'
+
+export * from './team'
+
+export * from './user'
\ No newline at end of file
diff --git a/server/src/types/mongoose.ts b/server/src/types/mongoose.ts
new file mode 100644
index 00000000..ab1d4f97
--- /dev/null
+++ b/server/src/types/mongoose.ts
@@ -0,0 +1,9 @@
+import { Model, Document, Types } from 'mongoose'
+
+type Omit = Pick>;
+export interface RootDocument {
+ _id: Types.ObjectId;
+}
+export function createNew(model: Model, doc: Omit) {
+ return new model(doc);
+}
\ No newline at end of file
diff --git a/server/src/types/notification.ts b/server/src/types/notification.ts
new file mode 100644
index 00000000..c50351bb
--- /dev/null
+++ b/server/src/types/notification.ts
@@ -0,0 +1,20 @@
+import { RootDocument } from './mongoose'
+import { Document } from 'mongoose'
+import { IUser } from './user'
+import { ITeam } from './team'
+
+export interface INotification extends RootDocument {
+ message: string;
+ bio: string;
+ idea: string;
+ notificationType: string;
+ sender: IUser & ITeam;
+ senderType: string;
+ receiverType: string;
+ receiver: IUser & ITeam;
+ resolved: boolean;
+
+}
+
+export type INotificationMongoose = (INotification & Document);
+
diff --git a/server/src/types/team.ts b/server/src/types/team.ts
new file mode 100644
index 00000000..f1300daf
--- /dev/null
+++ b/server/src/types/team.ts
@@ -0,0 +1,17 @@
+import { RootDocument } from './mongoose'
+import { Document } from 'mongoose'
+import { IUser } from './user'
+
+export interface ITeam extends RootDocument{
+ uuid: string;
+ creator: string;
+ name: string;
+ picture?: string;
+ members: IUser[];
+ interests?: string[];
+ description?: string;
+ project_idea?: string;
+ public: boolean;
+}
+
+export type ITeamMongoose = (ITeam & Document);
diff --git a/server/src/types/user.ts b/server/src/types/user.ts
new file mode 100644
index 00000000..6ad82f59
--- /dev/null
+++ b/server/src/types/user.ts
@@ -0,0 +1,25 @@
+import { RootDocument } from './mongoose'
+import { Document } from 'mongoose'
+import { ITeam } from './team'
+
+export interface IUser extends RootDocument {
+ uuid: string;
+ email: string;
+ name: string;
+ token: string | null;
+ admin?: boolean;
+ school?: string;
+ grad_year?: string;
+ skills?: string[];
+ beginner?: boolean;
+ experience?: string;
+ contact?: string;
+ image?: string;
+ contact_method?: string;
+ visible?: number;
+ team?: ITeam;
+ slackid: string;
+}
+
+export type IUserMongoose = (IUser & Document);
+
diff --git a/server/src/utils/index.ts b/server/src/utils/index.ts
new file mode 100644
index 00000000..915834d8
--- /dev/null
+++ b/server/src/utils/index.ts
@@ -0,0 +1 @@
+export { default as sendSlackMessage } from './slack'
\ No newline at end of file
diff --git a/server/src/sendSlackMessage.ts b/server/src/utils/slack.ts
similarity index 100%
rename from server/src/sendSlackMessage.ts
rename to server/src/utils/slack.ts
diff --git a/server/tsconfig.json b/server/tsconfig.json
index c8eb0cb7..8638fa0a 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -20,7 +20,8 @@
"noUnusedParameters": false,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
- "esModuleInterop": true
+ "esModuleInterop": true,
+ "skipLibCheck": true
},
"include": [
"src/**/*"
diff --git a/workspace.code-workspace b/workspace.code-workspace
new file mode 100644
index 00000000..362d7c25
--- /dev/null
+++ b/workspace.code-workspace
@@ -0,0 +1,7 @@
+{
+ "folders": [
+ {
+ "path": "."
+ }
+ ]
+}
\ No newline at end of file