|
1 | 1 | import structlog
|
| 2 | +import os |
2 | 3 |
|
3 |
| -from flask import Blueprint, request, jsonify, redirect |
| 4 | +from flask import Flask, Blueprint, request, jsonify, redirect |
| 5 | + |
| 6 | +<<<<<<< HEAD |
| 7 | +<<<<<<< HEAD |
| 8 | +from conditional import app |
| 9 | + |
| 10 | +======= |
| 11 | +>>>>>>> 855042d (Added CHANNEL_ID variable (needs to be set to a value) in config.env.py, and created a webhook Slack integration that posts to CHANNEL_ID when a major project is submitted (major_project_submission.py)) |
| 12 | +======= |
| 13 | +from conditional import app |
| 14 | + |
| 15 | +>>>>>>> db584f4 (obtained app via init.py) |
| 16 | +import requests, json |
4 | 17 |
|
5 | 18 | from sqlalchemy import desc
|
6 | 19 |
|
@@ -61,6 +74,16 @@ def submit_major_project(user_dict=None):
|
61 | 74 | return jsonify({"success": False}), 400
|
62 | 75 | project = MajorProject(user_dict['username'], name, description)
|
63 | 76 |
|
| 77 | +<<<<<<< HEAD |
| 78 | +<<<<<<< HEAD |
| 79 | + send_slack_ping({"text":f"<!subteam^S5XENJJAH> {user_dict['username']} submitted their major project, *{name}*!"}) |
| 80 | +======= |
| 81 | + send_slack_ping({"text":f"{user_dict['username']} submitted their major project, *{name}*!"}) |
| 82 | +>>>>>>> 855042d (Added CHANNEL_ID variable (needs to be set to a value) in config.env.py, and created a webhook Slack integration that posts to CHANNEL_ID when a major project is submitted (major_project_submission.py)) |
| 83 | +======= |
| 84 | + send_slack_ping({"text":f"<!subteam^S5XENJJAH> {user_dict['username']} submitted their major project, *{name}*!"}) |
| 85 | +>>>>>>> 0f7f14c (added a ping for eboard) |
| 86 | + |
64 | 87 | db.session.add(project)
|
65 | 88 | db.session.commit()
|
66 | 89 | return jsonify({"success": True}), 200
|
@@ -114,3 +137,18 @@ def major_project_delete(pid, user_dict=None):
|
114 | 137 | return jsonify({"success": True}), 200
|
115 | 138 |
|
116 | 139 | return "Must be project owner to delete!", 401
|
| 140 | + |
| 141 | +def send_slack_ping(payload): |
| 142 | +<<<<<<< HEAD |
| 143 | +<<<<<<< HEAD |
| 144 | +<<<<<<< HEAD |
| 145 | + return requests.post(app.config['WEBHOOK_URL'], json.dumps(payload)) |
| 146 | +======= |
| 147 | + return requests.post(app.config['CHANNEL_ID'], json.dumps(payload)) |
| 148 | +>>>>>>> 855042d (Added CHANNEL_ID variable (needs to be set to a value) in config.env.py, and created a webhook Slack integration that posts to CHANNEL_ID when a major project is submitted (major_project_submission.py)) |
| 149 | +======= |
| 150 | + return requests.post(app.config['WEBHOOK_URL'], json.dumps(payload)) |
| 151 | +>>>>>>> b828e44 (updated the conf variable) |
| 152 | +======= |
| 153 | + return requests.post(app.config['WEBHOOK_URL'], json.dumps(payload)) |
| 154 | +>>>>>>> ba4071a (Added newline) |
0 commit comments