Merge pull request #168 from chynh/mentor-command-fix

Require comments and add "non veteran" option in mentor request form

Author: Aaron Suarez

pybot/endpoints/airtable/message_templates/messages.py

@@ -1,12 +1,13 @@
 from typing import List
 
 
-def mentor_request_text(user_id, service, skillsets, requested_mentor_message=None):
+def mentor_request_text(user_id, service, skillsets, affiliation, requested_mentor_message=None):
     if not skillsets:
         skillsets = "None provided"
     text = (
         f"User <@{user_id}> has requested a mentor for {service}\n\n"
-        f"Requested Skillset(s): {skillsets.replace(',', ', ')}"
+        f"Requested Skillset(s): {skillsets.replace(',', ', ')}\n\n"
+        f"Requestor Affiliation: {affiliation}"
     )
 
     if requested_mentor_message:

pybot/endpoints/airtable/utils.py

@@ -65,6 +65,7 @@ def _create_messages(
             slack_id,
             service_translation,
             request.get("skillsets", None),
+            request.get('affiliation', 'None Provided'),
             requested_mentor_message,
         ),
         "attachments": claim_mentee_attachment(request["record"]),

pybot/endpoints/slack/message_templates/commands.py

@@ -78,7 +78,7 @@ def mentor_request_blocks(services, skillsets):
         {
             "type": "section",
             "block_id": "comments",
-            "text": {"type": "mrkdwn", "text": "*Add additional comments* (optional)"},
+            "text": {"type": "mrkdwn", "text": "*Add comments* (required)"},
             "accessory": {
                 "type": "button",
                 "action_id": "comments_btn",
@@ -111,6 +111,10 @@ def mentor_request_blocks(services, skillsets):
                         "text": {"type": "plain_text", "text": "Military Spouse"},
                         "value": "Military Spouse",
                     },
+                    {
+                        "text": {"type": "plain_text", "text": "Non Veteran"},
+                        "value": "Non Veteran",
+                    },
                 ],
             },
         },

pybot/endpoints/slack/message_templates/mentor_request.py

@@ -81,14 +81,14 @@ def affiliation(self, new_affiliation: str) -> None:
             self.clear_errors()
 
     def validate_self(self) -> bool:
-        if not self.service or not self.affiliation:
+        if not self.service or not self.affiliation or not self.details:
             return False
         self.clear_errors()
         return True
 
     def add_errors(self) -> None:
         submit_attachment = {
-            "text": ":warning: Service and group certification are required. :warning:",
+            "text": ":warning: Service, group certification and comments are required. :warning:",
             "color": "danger",
         }
         self.attachments = [submit_attachment]