update and consolidate env vars

Author: wimo7083

pybot/endpoints/airtable/utils.py

@@ -7,10 +7,9 @@
 from slack.exceptions import SlackAPIError
 from slack.io.aiohttp import SlackAPI
 from pybot.plugins.airtable.api import AirtableAPI
+from pybot.endpoints.slack.utils import MENTOR_CHANNEL
 from .message_templates.messages import claim_mentee_attachment, mentor_request_text
 
-MENTORS_CHANNEL = os.environ.get("MENTORS_CHANNEL") or "G1DRT62UC"
-
 
 async def _get_requested_mentor(requested_mentor: Optional[str], slack: SlackAPI,
                                 airtable: AirtableAPI) -> Optional[str]:
@@ -49,17 +48,17 @@ def _create_messages(mentors: List[str], request: dict, requested_mentor_message
         'text': mentor_request_text(slack_id, service_translation, request.get('skillsets', None),
                                     requested_mentor_message),
         'attachments': claim_mentee_attachment(request['record']),
-        'channel': MENTORS_CHANNEL
+        'channel': MENTOR_CHANNEL
     }
 
     details_message = {
         'text': f"Additional details: {request.get('details', 'None Given')}",
-        'channel': MENTORS_CHANNEL
+        'channel': MENTOR_CHANNEL
     }
 
     matching_mentors_message = {
         'text': "Mentors matching all or some of the requested skillsets: " + ' '.join(mentors),
-        'channel': MENTORS_CHANNEL
+        'channel': MENTOR_CHANNEL
     }
 
     return first_message, details_message, matching_mentors_message

pybot/endpoints/slack/utils/__init__.py

@@ -4,10 +4,12 @@
 
 load_dotenv()
 
+MENTOR_CHANNEL = os.environ.get("MENTOR_CHANNEL") or "G1DRT62UC"
 COMMUNITY_CHANNEL = os.environ.get("COMMUNITY_CHANNEL") or "G12343"
 MODERATOR_CHANNEL = os.environ.get('REPORT_CHANNEL') or 'G8NDRJJF9'
+TICKET_CHANNEL = os.environ.get('TICKET_CHANNEL') or 'G8NDRJJF9'
 APP_TOKEN = os.environ.get('APP_TOKEN') or "123"
 YELP_TOKEN = os.environ.get('YELP_TOKEN') or 'token'
 PYBACK_HOST = os.environ.get('PYBACK_HOST') or 'pyback'
 PYBACK_PORT = os.environ.get('PYBACK_PORT') or 8000
-PYBACK_TOKEN = os.environ.get('PYBACK_TOKEN') or 'token'
+PYBACK_TOKEN = os.environ.get('PYBACK_TOKEN') or 'token'