From 57b3c5bf996169de50d58f26934a8fcd95608b37 Mon Sep 17 00:00:00 2001
From: "Campbell, Justin" <campb303@purdue.edu>
Date: Mon, 22 Feb 2021 13:31:34 -0500
Subject: [PATCH 01/75] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c4ded76..7ebe7f3 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,2 @@
-# webqueue2-api
\ No newline at end of file
+# webqueue2 API
+A Python based parser and RESTful API for ECN's webqueue.

From 0bb672a04f8dd107d540bda89b1ce03bc261ecf7 Mon Sep 17 00:00:00 2001
From: "Bennett, Jacob Daniel" <benne238@purdue.edu>
Date: Fri, 12 Mar 2021 02:27:01 -0500
Subject: [PATCH 02/75] Add installation instructions to readme

---
 README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/README.md b/README.md
index 7ebe7f3..a168600 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,21 @@
 # webqueue2 API
 A Python based parser and RESTful API for ECN's webqueue.
+
+## Usage
+### Install via pip:
+```
+pip install git+https://github.itap.purdue.edu/ECN/webqueue2-api@<VERSION>#egg=webqueue2-api
+```
+For example, to install version 0.9.1:
+```
+pip install git+https://github.itap.purdue.edu/ECN/webqueue2-api@0.9.1#egg=webqueue2-api
+```
+
+### Install via requirements file:
+```
+git+https://github.itap.purdue.edu/ECN/webqueue2-api@<VERSION>#egg=webqueue2-api
+```
+For example, to install version 0.9.1:
+```
+git+https://github.itap.purdue.edu/ECN/webqueue2-api@0.9.1#egg=webqueue2-api
+```

From 4e471189ed4c2b9e3a141cf48dd3948df6f12616 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Fri, 28 May 2021 14:36:37 -0400
Subject: [PATCH 03/75] Create Item module in webqueue2api package

---
 src/webqueue2api/Item.py     | 1173 ++++++++++++++++++++++++++++++++++
 src/webqueue2api/__init__.py |    1 +
 2 files changed, 1174 insertions(+)
 create mode 100644 src/webqueue2api/Item.py
 create mode 100644 src/webqueue2api/__init__.py

diff --git a/src/webqueue2api/Item.py b/src/webqueue2api/Item.py
new file mode 100644
index 0000000..d5bcdf9
--- /dev/null
+++ b/src/webqueue2api/Item.py
@@ -0,0 +1,1173 @@
+import os
+import time
+import email
+import re
+import datetime
+from dateutil.parser import parse
+from dateutil import tz
+from typing import Union
+
+queueDirectory = "/home/pier/e/queue/Mail"
+
+class Item:
+    """A single issue.
+
+    Example:
+            # Create an Item (ce100)
+            >>> item = Item("ce", 100)
+
+    Attributes:
+            lastUpdated: An ISO 8601 formatted time string showing the last time the file was updated according to the filesystem.
+            headers: A list of dictionaries containing header keys and values.
+            content: A list of section dictionaries.
+            isLocked: A boolean showing whether or not a lockfile for the item is present.
+            userEmail: The email address of the person who this item is from.
+            userName: The real name of the person who this item is from.
+            userAlias: The Purdue career account alias of the person this item is from.
+            assignedTo: The Purdue career account alias of the person this item is assigned to
+            subject: The subject of the original message for this item.
+            status: The most recent status update for the item.
+            priority: The most recent priority for this item.
+            department: The most recent department for this item.
+            dateReceived: The date this item was created.
+            jsonData: A JSON serializable representation of the Item.
+    """
+
+    def __init__(self, queue: str, number: int) -> None:
+        self.queue = queue
+        try:
+            self.number = int(number)
+        except ValueError:
+            raise ValueError(" Could not convert \"" +
+                             number + "\" to an integer")
+
+        self.__path = "/".join([queueDirectory, self.queue, str(self.number)])
+        self.lastUpdated = self.__getLastUpdated()
+        self.__rawItem = self.__getRawItem()
+        self.headers = self.__parseHeaders()
+        self.content = self.__parseSections()
+        self.isLocked = self.__isLocked()
+        self.userEmail = self.__parseFromData(data="userEmail")
+        self.userName = self.__parseFromData(data="userName")
+        self.userAlias = self.__getUserAlias()
+        self.assignedTo = self.__getMostRecentHeaderByType("Assigned-To")
+        self.subject = self.__getMostRecentHeaderByType("Subject")
+        self.status = self.__getMostRecentHeaderByType("Status")
+        self.priority = self.__getMostRecentHeaderByType("Priority")
+        self.department = self.__getMostRecentHeaderByType("Department")
+        self.building = self.__getMostRecentHeaderByType("Building")
+        self.dateReceived = self.__getFormattedDate(
+            self.__getMostRecentHeaderByType("Date"))
+
+        # TODO: Autopopulate jsonData w/ __dir__() command. Exclude `^_` and `jsonData`.
+        self.jsonData = {
+            "queue": self.queue,
+            "number": self.number,
+            "lastUpdated": self.lastUpdated,
+            "headers": self.headers,
+            "content": self.content,
+            "isLocked": self.isLocked,
+            "userEmail": self.userEmail,
+            "userName": self.userName,
+            "userAlias": self.userAlias,
+            "assignedTo": self.assignedTo,
+            "subject": self.subject,
+            "status": self.status,
+            "priority": self.priority,
+            "department": self.department,
+            "building": self.building,
+            "dateReceived": self.dateReceived
+        }
+
+    def __getLastUpdated(self) -> str:
+        """Returns last modified time of item reported by the filesystem in mm-dd-yy hh:mm am/pm format.
+
+        Example: 
+                07-23-20 10:34 AM
+
+        Returns:
+                str: last modified time of item reported by the filesystem in mm-dd-yy hh:mm am/pm format.
+        """
+        # TODO: Simplify this code block by allowing __getFormattedDate to accept milliseconds since the epoch.
+        unixTime = os.path.getmtime(self.__path)
+        formattedTime = time.strftime(
+            '%m-%d-%y %I:%M %p', time.localtime(unixTime))
+        return self.__getFormattedDate(formattedTime)
+
+    def __getRawItem(self) -> list:
+        """Returns a list of all lines in the item file
+
+        Returns:
+                list: List of all the lines in the item file
+        """
+        with open(self.__path, errors="replace") as file:
+            return file.readlines()
+
+    def __getHeaderBoundary(self) -> int:
+        """Returns the 0 based line number where the Item headers stop.
+
+        Example: The header end would be on line 13
+                12: X-ECN-Queue-Original-URL:
+                13: 
+                14: I need help.
+
+        Returns:
+                int: line number where the Item headers end
+        """
+        for lineNumber, line in enumerate(self.__rawItem):
+            if line == "\n":
+                return lineNumber
+
+    def __parseHeaders(self) -> list:
+        """Returns a list containing dictionaries of header type and data.
+        Removes queue prefixes and whitespace.
+
+        Examples:
+                "[ce] QStatus: Dont Delete\\nFrom: Justin Campbell <campb303@purdue.edu>\\n"
+                becomes 
+                [ 
+                        {"QStatus": "Don't Delete"},
+                        {"From": "Justin Campbell <campb303@purdue.edu>"}
+                ]
+
+        Returns:
+                list: Header dicts
+        """
+        headerString = ""
+
+        # Remove '[queue] ' prefixes:
+        # Example:
+        #	[ce] QTime-Updated-By: campb303 becomes
+        # 	QTime-Updated-By: campb303
+        queuePrefixPattern = re.compile(r"\[.*?\] {1}")
+        for lineNumber in range(self.__getHeaderBoundary()):
+            line = self.__rawItem[lineNumber]
+            lineHasQueuePrefix = queuePrefixPattern.match(line)
+
+            if lineHasQueuePrefix:
+                queuePrefix = line[lineHasQueuePrefix.regs[0]
+                                   [0]: lineHasQueuePrefix.regs[0][1]]
+                line = line.replace(queuePrefix, "")
+
+            headerString += line
+
+        # message = email.message_from_string(headerString + "".join(self.__getContent()))
+        message = email.message_from_string(headerString)
+
+        headers = []
+        dateHeaders=[
+            "QStatus-Updated-Time",
+            "Status-Updated-Time",
+            "Edited-Time",
+            "QTime-Updated-Time",
+            "Merged-Time",
+            "Time-Updated-Time",
+            "Replied-Time",
+            "Assigned-To-Updated-Time",
+            "QAssigned-To-Updated-Time",
+            "Date",
+            "Sent"
+        ]
+
+        for key in message.keys():
+            headers.append({"type": key, "content": self.__getFormattedDate(message[key]) if key in dateHeaders else message[key]})
+
+        return headers
+
+    # TODO: Implement attachment parsing
+
+    def __parseSections(self) -> list:
+        # List of all item events
+        sections = []
+
+        contentStart = self.__getHeaderBoundary() + 1
+        contentEnd = len(self.__rawItem) - 1
+
+        # List of assignments for the item
+        assignementLsit = self.__assignmentParsing(contentStart)
+
+        # Appends each assignment individually to sections
+        for assignment in assignementLsit:
+            sections.append(assignment)
+
+        # Checks for empty content within an item and returns and
+        if contentEnd <= contentStart:
+            blankInitialMessage = self.__initialMessageParsing([""])
+            sections.append(blankInitialMessage)
+            return sections
+
+        # Checks for Directory Identifiers
+        if self.__rawItem[contentStart] == "\n" and self.__rawItem[contentStart + 1].startswith("\t"):
+
+            directoryStartLine = contentStart + 1
+
+            # Parses the directory information and returns a dictionary of directory values
+            directoryInfo = self.__directoryParsing(directoryStartLine)
+
+            # Appends Directory Information into the sections array
+            sections.append(directoryInfo)
+
+            # Sets the initial message start to the next line after all directory lines and newlines
+            contentStart = contentStart + len(directoryInfo) + 1
+
+        # The start line, type, and end line for item events
+        sectionBoundaries = []
+
+        # Delimiter info
+        delimiters = [
+            {"name": "edit", "pattern": "*** Edited"},
+            {"name": "status", "pattern": "*** Status"},
+            {"name": "replyToUser", "pattern": "*** Replied"},
+            {"name": "replyFromUser", "pattern": "=== "},
+        ]
+
+        # Signifies that there is an initial message to parse
+        initialMessageSection = True
+
+        # Parses the entire contents of the message, stores everything before any delimiter as the initial message
+        # and the line number of any delimiters as well as the type
+        for lineNumber in range(contentStart, contentEnd + 1):
+
+            line = self.__rawItem[lineNumber]
+
+            # Looks for a starting delimiter and explicity excludes the reply-from-user ending delimiter
+            if (line.startswith("*** Edited by: ") or
+                    line.startswith("*** Replied by: ") or
+                    line.startswith("*** Status updated by: ") or
+                    line == "=== Additional information supplied by user ===\n" and not
+                    line == "===============================================\n"
+                    ):
+
+                # Sets the delimiter type based on the pattern within the delimiters list
+                for delimiter in delimiters:
+
+                    if line.startswith(delimiter["pattern"]):
+                        sectionBoundaries.append(
+                            {"start": lineNumber, "type": delimiter["name"]})
+                        break
+
+                # If a starting delimiter was encountered, then there is no initial message
+                if initialMessageSection:
+                    initialMessageSection = False
+
+            elif initialMessageSection == True:
+                # Delimiter not encountered yet, so append initial message starting line as the current lin number
+                sectionBoundaries.append(
+                    {"start": lineNumber, "type": "initial_message"})
+                initialMessageSection = False
+
+        # Used to set the end line of the last delimiter
+        sectionBoundaries.append({"start": contentEnd + 1})
+
+        # Sets the end of the section boundary to the begining of the next section boundary
+        for boundaryIndex in range(0, len(sectionBoundaries) - 1):
+
+            sectionBoundaries[boundaryIndex]["end"] = sectionBoundaries[boundaryIndex + 1]["start"]
+
+        # Remove End of File boundary since the line number has been assigned to the last delimiter
+        del sectionBoundaries[-1]
+
+        # Parses through all the boundaries in section boundaries
+        for boundary in sectionBoundaries:
+
+            # Sets line to the first line of the boundary (which is always the delimiter)
+            line = self.__rawItem[boundary["start"]]
+
+            # Returns all of the lines within the current section
+            sectionContent = self.__rawItem[boundary["start"]: boundary["end"]]
+
+            # Appends an initial message dictionary to sections
+            if boundary["type"] == "initial_message":
+                initialMessageDictionary = self.__initialMessageParsing(
+                    sectionContent)
+                sections.append(initialMessageDictionary)
+
+            elif boundary["type"] == "edit":
+                # Returns a dictionary with edit information
+                editInfo = self.__editParsing(
+                    sectionContent, boundary["start"])
+
+                # Checks for a parse error and appends it, returning the sections list which stops the parsing
+                if editInfo["type"] == "parse_error":
+                    sections.append(editInfo)
+                    return self.__getSortedSections(sections)
+
+                # Appends the edit dictionary to sections
+                sections.append(editInfo)
+
+            elif boundary["type"] == "replyToUser":
+                # Returns a dictionary with reply-to information
+                replyToInfo = self.__replyToParsing(
+                    sectionContent, boundary["start"])
+
+                # Checks for a parse error and appends it, returning the sections list which stops the parsing
+                if replyToInfo["type"] == "parse_error":
+                    sections.append(replyToInfo)
+                    return self.__getSortedSections(sections)
+
+                # Appends the reply-to to sections
+                sections.append(replyToInfo)
+
+            elif boundary["type"] == "status":
+                # Returns a dictionary with status information
+                statusInfo = self.__statusParsing(
+                    sectionContent, boundary["start"])
+
+                if statusInfo["type"] == "parse_error":
+                    sections.append(statusInfo)
+                    return self.__getSortedSections(sections)
+
+                # Appends the status to sections
+                sections.append(statusInfo)
+
+            elif boundary["type"] == "replyFromUser":
+                # Returns a dictionary with userReply information
+                replyFromInfo = self.__userReplyParsing(
+                    sectionContent, boundary["start"])
+
+                if replyFromInfo["type"] == "parse_error":
+                    sections.append(replyFromInfo)
+                    return self.__getSortedSections(sections)
+
+                # Appends the replyFrom to sections
+                sections.append(replyFromInfo)
+
+        sortedSections = self.__getSortedSections(sections)
+
+        return sortedSections
+        # return sections
+
+    def __directoryParsing(self, directoryStartLine: int) -> dict:
+        """Returns a dictionary with directory information
+
+        Example:
+                Name: Nestor Fabian Rodriguez Buitrago
+                Login: rodri563
+                Computer: ce-205-38 (128.46.205.67)
+                Location: HAMP G230
+                Email: rodri563@purdue.edu
+                Phone: 7654766893
+                Office: HAMP G230
+                UNIX Dir: /home/bridge/b/rodri563
+                Zero Dir: U=\\bridge.ecn.purdue.edu\rodri563
+                User ECNDB: http://eng.purdue.edu/jump/2e8399a
+                Host ECNDB: http://eng.purdue.edu/jump/2e83999    
+                Subject: Autocad installation
+
+        Args:
+                directoryStartLine (int): line number within the item that the directory starts on
+
+        Returns:
+                dict: dictionary that splits each line within the directory into a key and a value
+        """
+        directoryInformation = {"type": "directory_information"}
+
+        directoryPossibleKeys = [
+            "Name",
+            "Login",
+            "Computer",
+            "Location",
+            "Email",
+            "Phone",
+            "Office",
+            "UNIX Dir",
+            "Zero Dir",
+            "User ECNDB",
+            "Host ECNDB",
+            "Subject"
+        ]
+        # Executies until the directory start line is greater than the directory ending line
+        while True:
+
+            # Returns the line number at directory start line
+            info = self.__rawItem[directoryStartLine]
+
+            # Breaks the loop if it encountrs a newline, signifying the end of the directory information
+            if info == "\n":
+
+                break
+
+            else:
+
+                # Removes white including space, newlines, and tabs from the directory info line
+                strippedInfo = info.strip()
+
+                # Attempts to find ": " but will accept ":", denoting a blank entry for a directory item
+                if ": " in strippedInfo:
+
+                    # Seperates the directory info line into two variables, the first variable being the key, the second being the value
+                    # swt1
+                    key, value = strippedInfo.split(": ", 1)
+
+                    if key in directoryPossibleKeys:
+                        # Adds the key value pair to the directory info dictionary
+                        directoryInformation[key] = value
+                    else:
+                        # Casts the list type on to a dictionary
+                        dictionaryList = list(directoryInformation)
+                        # Length of dictionary list
+                        lenDictionaryList = len(dictionaryList)
+                        # The last key appended to the directory dictionary
+                        lastKeyAppended = dictionaryList[lenDictionaryList - 1]
+
+                        directoryInformation[lastKeyAppended] = directoryInformation[lastKeyAppended] + \
+                            " " + strippedInfo
+
+                elif ":" in strippedInfo:
+
+                    # Seperates the directory info line into two variables, the first variable being the key, the second being the value
+                    key, value = strippedInfo.split(":", 1)
+
+                    if key in directoryPossibleKeys:
+                        # Adds the key value pair to the directory info dictionary
+                        directoryInformation[key] = value
+                    else:
+                        # Casts the list type on to a dictionary
+                        dictionaryList = list(directoryInformation)
+                        # Length of dictionary list
+                        lenDictionaryList = len(dictionaryList)
+                        # The last key appended to the directory dictionary
+                        lastKeyAppended = dictionaryList[lenDictionaryList - 1]
+
+                        directoryInformation[lastKeyAppended] = directoryInformation[lastKeyAppended] + \
+                            " " + strippedInfo
+
+                # Signifies that this line belongs to the most previous line
+                elif ": " not in strippedInfo and ":" not in strippedInfo:
+                    # Casts the list type on to a dictionary
+                    dictionaryList = list(directoryInformation)
+                    # Length of dictionary list
+                    lenDictionaryList = len(dictionaryList)
+                    # The last key appended to the directory dictionary
+                    lastKeyAppended = dictionaryList[lenDictionaryList - 1]
+
+                    directoryInformation[lastKeyAppended] = directoryInformation[lastKeyAppended] + \
+                        " " + strippedInfo
+            # Counter to denote the end of the directory
+            directoryStartLine = directoryStartLine + 1
+
+        # Returns the directory information dictionary
+        return directoryInformation
+
+    def __assignmentParsing(self, contentStart: int) -> list:
+        """Returns a list with assignment information dictionaries
+
+        Example:
+                Assigned-To: campb303
+                Assigned-To-Updated-Time: Tue, 23 Jun 2020 13:27:00 EDT
+                Assigned-To-Updated-By: campb303
+
+        Args:
+                contentStart (int): line number where the content starts
+
+        Returns:
+                list: [
+                        {"type": "assignment",
+                        "datetime": datetime of the assignment,
+                        "by": user who initiated the assignment,
+                        "to": user who was assigned
+                        },
+                ]
+        """
+        assignmentList = []
+
+        # Assignment Information
+        assignedBy = ""
+        assignedDateTime = ""
+        assignedTo = ""
+
+        # Parses the header looking for assignment delimeters and stores info into their respective variables
+        for headerContent in range(0, contentStart):
+
+            line = self.__rawItem[headerContent]
+
+            # Gets who the Item was assigned to
+            if line.startswith("Assigned-To: "):
+
+                assignedTo = (
+                    re.search("(?<=Assigned-To: )(.*)", line)).group()
+
+            # Gets the date the Item was assigned
+            elif line.startswith("Assigned-To-Updated-Time: "):
+
+                dateFromLine = (
+                    re.search("(?<=Assigned-To-Updated-Time: )(.*)", line)).group()
+
+                assignedDateTime = self.__getFormattedDate(dateFromLine)
+
+            # Gets who assigned the Item
+            elif line.startswith("Assigned-To-Updated-By: "):
+
+                assignedBy = (
+                    re.search("(?<=Assigned-To-Updated-By: )(.*)", line)).group()
+
+                # Appends the assignment to the sections list
+                assignmentList.append(
+                    {"type": "assignment",
+                     "datetime": assignedDateTime,
+                     "by": assignedBy,
+                     "to": assignedTo}
+                )
+
+        return assignmentList
+
+    def __initialMessageParsing(self, content: list) -> dict:
+        """Returns a dictionary with initial message information
+
+        Example:
+                \n
+                Testtest\n
+                \n
+
+        Args:
+                content (list): content of the initial message
+
+        Returns:
+                dict: 
+                "type": "initial_message", 
+                "datetime": datetime the initial message was sent,
+                "from_name": from_name,
+                "from_email": user_email,
+                "to": [{email, name}],
+                "cc": [{email, name}],
+                "subject": initial message subject
+                "content": content of the initial message
+        """
+        initialMessageDictionary = {}
+
+        initialMessageDictionary["type"] = "initial_message"
+
+        # Gets the initial message date from the header
+        rawMessageDateStr = self.__getMostRecentHeaderByType("Date")
+
+        # Sets datetime in the intialMessage dictionary to UTC formatted date
+        initialMessageDictionary["datetime"] = self.__getFormattedDate(
+            rawMessageDateStr)
+
+        initialMessageDictionary["from_name"] = self.__parseFromData(
+            data="userName")
+
+        initialMessageDictionary["from_email"] = self.__parseFromData(
+            data="userEmail")
+
+        # Stores list of dictionaries for the recipients of the initial message
+        initialMessageDictionary["to"] = []
+
+        # Parses the header looking for recipients of the initial message and stores it in a list of tuples
+        rawMessageRecipientsList = email.utils.getaddresses(
+            [self.__getMostRecentHeaderByType("To")])
+
+        # Parses the CC list and stores the cc recipient information in a list of dictionaries
+        for recipients in rawMessageRecipientsList:
+
+            initialMessageDictionary["to"].append(
+                {"name": recipients[0],
+                 "email": recipients[1]}
+            )
+
+        # Stores list of dictionaries for CC information
+        initialMessageDictionary["cc"] = []
+
+        # Parses the header looking for CC recipients of the initial message and stores it in a list of tuples
+        rawMessageCCList = email.utils.getaddresses(
+            [self.__getMostRecentHeaderByType("CC")])
+
+        # Parses the CC list and stores the cc recipient information in a list of dictionaries
+        for ccRecipients in rawMessageCCList:
+
+            initialMessageDictionary["cc"].append(
+                {"name": ccRecipients[0],
+                 "email": ccRecipients[1]}
+            )
+
+        initialMessageDictionary["subject"] = self.__getMostRecentHeaderByType(
+            "Subject")
+
+        # Removes unecessary newlines from the begining and the end of the initial message
+        initialMessageDictionary["content"] = self.__getFormattedSectionContent(
+            content)
+
+        return initialMessageDictionary
+
+    def __editParsing(self, content: list, lineNum: int) -> dict:
+        """Returns a dictionary with edit information
+
+        Example:
+                *** Edited by: campb303 at: 06/23/20 13:27:56 ***\n
+                \n
+                This be an edit my boy\n
+                \n
+                \n
+                \n
+
+        Args:
+                content (list): content of an edit
+                lineNum (int): line number of an edit within an item
+
+        Returns:
+                dict: a dictionary with these keys, 
+                        "type": "edi", 
+                        "by": initiator of the edit,
+                        "datetime": datetime of the edit,
+                        "content": content of the edit
+        """
+
+        # Edit Info dictionary
+        editInfo = {}
+
+        for count, line in enumerate(content):
+            if line == "===============================================\n":
+                errorMessage = "Reply-from-user ending delimter encountered without Reply-from-user starting delimter"
+                return self.__errorParsing(line, lineNum + count + 1, errorMessage)
+
+        editInfo["type"] = "edit"
+
+        delimiterLine = content[0]
+        # Parses for the author of the edit, which is located between the "*** Edited by: " and " at:" substrings
+        try:
+            editInfo["by"] = (
+                re.search("(?<=\*{3} Edited by: )(.*)(?= at:)", delimiterLine)).group()
+        except:
+            errorMessage = "*** Edited by: [username] at: [date and time] ***\n"
+            return self.__errorParsing(delimiterLine, lineNum, errorMessage)
+
+        try:
+            # Parses for the date and time of the edit, which is located between the " at: " and "***\n" substrings
+            dateTimeString = (
+                re.search("(?<= at: )(.*)(?= \*\*\*\n)", delimiterLine)).group()
+        except:
+            # Returns an error message if there is no space after "at:"
+            errorMessage = "*** Edited by: [username] at: [date and time] ***\n"
+            return self.__errorParsing(delimiterLine, lineNum, errorMessage)
+
+        # Attempts to format the date and time into utc format
+        editInfo["datetime"] = self.__getFormattedDate(dateTimeString)
+
+        # Remove the delimiter String and unecessary newlines
+        editInfo["content"] = self.__getFormattedSectionContent(content)
+
+        return editInfo
+
+    def __replyToParsing(self, content: list, lineNum: int) -> dict:
+        """Returns a dictionary with reply to user information
+
+        Example:
+                *** Replied by: campb303 at: 06/23/20 13:28:18 ***\n
+                \n
+                This be a reply my son\n
+                \n
+                Justin\n
+                ECN\n
+                \n
+
+        Args:
+                content (list): content of a reply to user
+                lineNum (int): line number of a reply to user in an item 
+
+        Returns:
+                dict: a dictionary with these keys, 
+                        "type": "reply_to_user", 
+                        "by": initiator of the reply to user,
+                        "datetime": datetime of the reply to user,
+                        "content": content of the reply to user
+        """
+        replyInfo = {}
+
+        replyInfo["type"] = "reply_to_user"
+
+        delimiterLine = content[0]
+
+        for count, line in enumerate(content):
+            if line == "===============================================\n":
+                errorMessage = "Reply-from-user ending delimter encountered without Reply-from-user starting delimter"
+                return self.__errorParsing(line, lineNum + count + 1, errorMessage)
+
+        try:
+            # Parses for the author of the reply, which is located between the "*** Replied by: " and " at:" substrings
+            replyInfo["by"] = (
+                re.search("(?<=\*{3} Replied by: )(.*)(?= at:)", delimiterLine)).group()
+        except:
+            errorMessage = "*** Replied by: [username] at: [date and time] ***\n"
+            return self.__errorParsing(delimiterLine, lineNum, errorMessage)
+
+        # Parses for the date and time of the reply, which is located between the " at: " and "***\n" substrings
+        try:
+            dateTimeString = (
+                re.search("(?<= at: )(.*)(?= \*\*\*\n)", delimiterLine)).group()
+        except:
+            errorMessage = "*** Replied by: [username] at: [date and time] ***\n"
+            return self.__errorParsing(delimiterLine, lineNum, errorMessage)
+
+        # Formats date to UTC
+        replyInfo["datetime"] = self.__getFormattedDate(dateTimeString)
+
+        replyInfo["content"] = self.__getFormattedSectionContent(content)
+
+        return replyInfo
+
+    def __statusParsing(self, content: list, lineNum: int) -> dict:
+        """Returns a dictionary with status information
+
+        Example:
+                *** Status updated by: campb303 at: 6/23/2020 13:26:55 ***\n
+                Dont Delete\n
+
+        Args:
+                content (list): The content of a status update
+                lineNum (int): The line number of a status update in an item
+
+        Returns:
+                dict: a dictionary with these keys, 
+                        "type": "status", 
+                        "by": initiator of the status update,
+                        "datetime": datetime of the status update,
+                        "content": content of the status update
+        """
+        statusInfo = {}
+
+        statusInfo["type"] = "status"
+
+        delimiterLine = content[0]
+
+        for count, line in enumerate(content):
+            if line == "===============================================\n":
+                errorMessage = "Reply-from-user ending delimter encountered without Reply-from-user starting delimter"
+                return self.__errorParsing(line, lineNum + count + 1, errorMessage)
+
+        # Parses for the author of the status change, which is located between the "*** Status updated by: " and " at:" substrings
+        try:
+            statusInfo["by"] = (
+                re.search("(?<=\*{3} Status updated by: )(.*)(?= at:)", delimiterLine)).group()
+        except:
+            errorMessage = "*** Status updated by: [username] at: [date and time] ***\n"
+
+            return self.__errorParsing(delimiterLine, lineNum, errorMessage)
+
+        # Parses for the date and time of the status change, which is located between the " at: " and "***\n" substrings
+        try:
+            dateTimeString = re.search(
+                "(?<= at: )(.*)(?= \*\*\*\n)", delimiterLine).group()
+        except:
+            errorMessage = "*** Status updated by: [username] at: [date and time] ***\n"
+
+            return self.__errorParsing(delimiterLine, lineNum, errorMessage)
+
+        # Formats the date to UTC
+        statusInfo["datetime"] = self.__getFormattedDate(dateTimeString)
+
+        # Remove the delimiter String and unecessary newlines
+        statusInfo["content"] = self.__getFormattedSectionContent(content)
+
+        return statusInfo
+
+    def __userReplyParsing(self, replyContent: list, lineNumber: int) -> dict:
+        """Returns a dictionary with user reply information
+
+        Example:
+                === Additional information supplied by user ===\n
+                \n
+                Subject: Re: Beepboop\n
+                From: Justin Campbell <campb303@purdue.edu>\n
+                Date: Tue, 23 Jun 2020 13:30:45 -0400\n
+                X-ECN-Queue-Original-Path: /home/pier/e/queue/Attachments/inbox/2020-06-23/212-original.txt\n
+                X-ECN-Queue-Original-URL: https://engineering.purdue.edu/webqueue/Attachments/inbox/2020-06-23/212-original.txt\n
+                \n
+                Huzzah!\n
+                \n
+                ===============================================\n
+                \n
+        Args:
+                replyContent (list): The entire section of a reply-from-user
+                lineNumber (int): The line number of the begining of a reply-from-user section within and item
+
+        Returns:
+                dict: a dictionary with these keys, 
+                        "type": "reply_from_user", 
+                        "from_name": name of the user that sent the reply,
+                        "from_email": email of the user that sent the reply,
+                        "subject": subject of the reply,
+                        "datetime": the datetime of the reply,
+                        "cc": [
+                                {"name": name of the carbon copied recipient,
+                                "email": email of the carbon copied recipient
+                                },
+                        ]
+                        "content": content of the reply
+                        "headers": [
+                                {"type": headerType,
+                                "content": content
+                                },
+                        ]
+        """
+        replyFromInfo = {}
+
+        replyFromInfo["type"] = "reply_from_user"
+
+        replyFromHeaders = []
+        newLineCounter = 0
+        endingDelimiterCount = 0
+
+        # Delimiter information line numbers to remove from reply from user
+        linesToRemove = []
+
+        # Parses the section content looking for any line that starts with a metadata, also tracks the line
+        # number with the enumerate function
+        for lineNum, line in enumerate(replyContent):
+
+            if endingDelimiterCount == 0 and lineNum == len(replyContent) - 1:
+                errorMessage = "Did not encounter a reply-from-user ending delimiter"
+                return self.__errorParsing(line, lineNumber + lineNum + 1, errorMessage)
+
+            if newLineCounter == 1 and line != "\n":
+
+                try:
+                    # Append header information for each headr line
+                    headerType, content = line.split(": ", 1)
+                    replyFromHeaders.append(
+                        {"type": headerType,
+                         "content": content
+                         }
+                    )
+                except:
+                    lenReplyFromHeaders = len(replyFromHeaders)
+                    if lenReplyFromHeaders == 0:
+                        errorMessage = ("Expected reply-from-user header information:\n" +
+                                        "=== Additional information supplied by user ===\n" +
+                                        "\n" +
+                                        "[Header Type]: [Header Value]\n" +
+                                        "\n"
+                                        )
+                        return self.__errorParsing(line, lineNumber + lineNum + 1, errorMessage)
+
+                    else:
+                        replyFromHeaders[lenReplyFromHeaders -
+                                         1]["content"] = replyFromHeaders[lenReplyFromHeaders - 1]["content"] + " " + line
+
+                linesToRemove.append(lineNum)
+            # Checks for a newline and breaks for loop on second occurance of a newline
+            if line == "\n":
+                newLineCounter = newLineCounter + 1
+
+                if newLineCounter == 2 and "datetime" not in replyFromInfo.keys():
+                        errorMessage = "Expected \"Date: [datetime]\" in the header info"
+                        return self.__errorParsing(line, lineNumber + lineNum + 1, errorMessage)
+
+            elif line == "===============================================\n":
+                endingDelimiterCount = endingDelimiterCount + 1
+
+            elif line.startswith("From: ") and newLineCounter == 1:
+                # Returns a list of one tuples with a name stored in the first index of the tuple and an email stored in the second index of the tuple
+                emailList = email.utils.getaddresses([line])
+                replyFromInfo["from_name"] = emailList[0][0]
+                replyFromInfo["from_email"] = emailList[0][1]
+
+            elif line.startswith("Subject: ") and newLineCounter == 1:
+                # Matches everything after "Subject: "
+                try:
+                    subjectStr = (
+                        re.search("(?<=Subject: )(.*)", line)).group()
+                except:
+                    errorMessage = "Expeted syntax of \"Subject: [subject]\""
+                    return self.__errorParsing(line, lineNumber + lineNum + 1, errorMessage)
+
+                # Formatts the date to UTC
+                replyFromInfo["subject"] = subjectStr
+
+            elif line.startswith("Date: ") and newLineCounter == 1:
+                # Matches everything after "Date: "
+                try:
+                    dateStr = (re.search("(?<=Date: )(.*)", line)).group()
+                except:
+                    errorMessage = "\"Date: [datetime]\""
+                    return self.__errorParsing(line, lineNumber + lineNum + 1, errorMessage)
+
+                # Formatts the date to UTC
+                replyFromInfo["datetime"] = self.__getFormattedDate(dateStr)
+
+            elif line.startswith("Cc: ") and newLineCounter == 1:
+
+                replyFromInfo["cc"] = []
+
+                # Returns a list of tuples with email information
+                recipientsList = email.utils.getaddresses([line])
+
+                # Parses through the cc tuple list
+                for cc in recipientsList:
+                    # Stores the cc information in a dictionary and appends it to the ccRecipientsList
+                    replyFromInfo["cc"].append(
+                        {"name": cc[0],
+                         "email": cc[1]}
+                    )
+
+        # Deletes reduntant lines from the message content in reverse order
+        for lineNum in sorted(linesToRemove, reverse=True):
+            replyContent.pop(lineNum)
+
+        # Strips any unnecessary newlines or any delimiters frm the message content
+        replyFromInfo["content"] = self.__getFormattedSectionContent(
+            replyContent)
+
+        replyFromInfo["headers"] = replyFromHeaders
+
+        return replyFromInfo
+
+    def __getFormattedSectionContent(self, sectionContent: list) -> list:
+        """Returns a list with message content that is stripped of unnecessary newlines and begining delimiters
+
+        Example:
+                *** Edited by: mph at: 02/21/20 10:27:16 ***\n
+                \n
+                Still need to rename machines - but the networking issue now seems to \n
+                be resolved via another ticket.\n
+                \n
+                \n
+                \n
+                \n
+                \n
+
+        Args:
+                sectionContent (list): The section content of a parsed section
+
+        Returns:
+                list: the section content of a parsed section without any delimiters and unnecessary newlines
+        """
+        # Continually removes the first line of sectionContent if it is a newline or delimiter in each iteration
+        while len(sectionContent) > 1:
+            if (sectionContent[0] == "\n" or
+                    sectionContent[0].startswith("*** Edited by: ") or
+                    sectionContent[0].startswith("*** Replied by: ") or
+                    sectionContent[0].startswith("*** Status updated by: ") or
+                    sectionContent[0] == "=== Additional information supplied by user ===\n" or
+                    sectionContent[0] == "===============================================\n"
+                    ):
+                sectionContent.pop(0)
+            else:
+                # Breaks the loop if the first line isn't a newline or delimiter
+                break
+
+        # Continually removes the last line of sectionContent if it is a newline or delimiter in each iteration
+        while len(sectionContent) > 1:
+            # Initializes the Length of sectionContent each iteration of the loop
+            sectionContentLength = len(sectionContent)
+
+            if (sectionContent[sectionContentLength - 1] == "\n" or
+                    sectionContent[sectionContentLength -
+                                   1] == "===============================================\n"
+                    ):
+                sectionContent.pop(sectionContentLength - 1)
+            else:
+                # Breaks the loop if the last line isn't a newline or delimiter
+                break
+
+        return sectionContent
+
+    def __errorParsing(self, line: str, lineNum: int, expectedSyntax: str) -> dict:
+        """Returns a dictionary with error parse information when a line is malformed
+
+        Example:
+                "*** Status updated by: ewhile at: 5/7/2020 10:59:11 *** sharing between\n"
+
+        Args:
+                line (str): line of that threw error
+                lineNum (int): line number in the item that threw error
+                expectedSyntax (str): a message stating the syntax the line should follow
+
+        Returns:
+                dict: a dictionary with these keys, 
+                        "type": "parse_error", 
+                        "datetime": time the error was encountered,
+                        "file_path": path of the item with erroneos line,
+                        "expected": expectedSyntax,
+                        "got": line,
+                        "line_num": lineNum
+        """
+        errorDictionary = {}
+
+        # Type
+        errorDictionary["type"] = "parse_error"
+
+        # Dateime of the parse error
+        errorDictionary["datetime"] = self.__getFormattedDate(
+            str(datetime.datetime.now()))
+
+        # Item filepath
+        errorDictionary["file_path"] = self.__path
+
+        # Expected value
+        errorDictionary["expected"] = expectedSyntax
+
+        # line that threw error
+        errorDictionary["got"] = line
+
+        # line number that threw error
+        errorDictionary["line_num"] = lineNum
+
+        # returns the error dictionary
+        return errorDictionary
+
+    def __getSortedSections(self, sectionsList: list) -> list:
+        """Sorts the sections chronologically by datetime
+
+        Example:
+                [example] need to do
+
+        Args:
+                sections (list): the list of sections to be sorted
+
+        Returns:
+                list: a list of sections sorted by datetime
+        """
+        sectionsLength = len(sectionsList)
+        sortedSections = []
+        oldestSection = {}
+
+        while len(sortedSections) < sectionsLength:
+
+            for iteration, currentSection in enumerate(sectionsList):
+
+                if currentSection["type"] == "directory_information":
+                    sortedSections.append(currentSection)
+                    sectionsList.remove(currentSection)
+                    break
+
+                if iteration == 0:
+                    oldestSection = currentSection
+
+                #datetime.datetime.strptime(date_time_str, '%Y-%m-%d %H:%M:%S.%f')
+
+                elif parse(currentSection["datetime"]) < parse(oldestSection["datetime"]):
+                    oldestSection = currentSection
+
+                if iteration == len(sectionsList) - 1:
+                    sortedSections.append(oldestSection)
+                    sectionsList.remove(oldestSection)
+
+        return sortedSections
+
+    def __isLocked(self) -> Union[str, bool]:
+        """Returns a string info about the lock if true and a bool False if false
+
+        Example: A file is locked
+                "CE 100 is locked by campb303 using qvi"
+
+        Example: a file is not locked
+                False
+
+        Returns:
+                Union[str, bool]: String with info about lock if true, bool False if false
+        """
+        lockFile = self.__path + ".lck"
+        if os.path.exists(lockFile):
+            with open(lockFile) as file:
+                lockInfo = file.readline().split(" ")
+                lockedBy = lockInfo[4]
+                lockedUsing = lockInfo[1]
+                return "{queue} {number} is locked by {lockedBy} using {lockedUsing}".format(queue=self.queue, number=self.number, lockedBy=lockedBy, lockedUsing=lockedUsing)
+        else:
+            return False
+
+    def __getMostRecentHeaderByType(self, headerType: str) -> str:
+        """Return the data of most recent header of the given type. 
+        If no header of that type exists, return an empty string.
+
+        Example: Requesting a Status header that does exist
+                __getMostRecentHeaderByType("Status")
+                becomes  "Waiting for Reply"
+
+        Example: Requesting a Status header that doesn't exist
+                __getMostRecentHeaderByType("Status")
+                becomes ""
+
+        Args:
+                headerType (str): Type of header to return.
+
+        Returns:
+                str: data of most recent header of the given type or empty string.
+        """
+        for header in self.headers:
+            if header["type"] == headerType:
+                return header["content"]
+        return ""
+
+    def __parseFromData(self, data: str) -> str:
+        """Parse From header and return requested data.
+        Returns empty string if requested data is unavailable.
+
+        Examples: From data is "From: Campbell, Justin <campb303@purdue.edu>"
+                __parseFromData(data="userName") returns "Campbell, Justin"
+                __parseFromData(data="userEmail") returns "campb303@purdue.edu"
+
+        Args:
+                data (str): The data desired; can be "userName" or "userEmail".
+
+        Returns:
+                str: userName, userEmail or empty string.
+        """
+        fromHeader = self.__getMostRecentHeaderByType("From")
+        userName, userEmail = email.utils.parseaddr(fromHeader)
+
+        if data == "userName":
+            return userName
+        elif data == "userEmail":
+            return userEmail
+        else:
+            raise ValueError(
+                "data='" + str(data) + "' is not a valid option. data must be \"userName\" or \"userEmail\".")
+
+    def __getUserAlias(self) -> str:
+        """Returns user's Career Account alias if present.
+        If Career Account alias isn't present, returns empty string.
+
+        Example: Email from campb303@purdue.edu
+                userAlias = "campb303"
+
+        Example: Email from spam@spammer.net
+                userAlias = "" 
+
+        Returns:
+                str: User's Career Account alias if present or empty string
+        """
+
+        
+        try:
+            emailUser, emailDomain = self.userEmail.split("@")
+
+        # Returns an error parse if the self.useremail doesn't contain exactally one "@" symbol
+        except ValueError:
+            # Parses through the self.headers list to find the "From" header and its line number
+            for lineNum, header in enumerate(self.headers):
+                if header["type"] == "From":
+                    headerString = header["type"] + ": " + header["content"]
+                    return self.__errorParsing(headerString, lineNum + 1, "Expected valid email Address")
+
+        return emailUser if emailDomain.endswith("purdue.edu") else ""
+
+    def __getFormattedDate(self, date: str) -> str:
+        """Returns the date/time formatted as RFC 8601 YYYY-MM-DDTHH:MM:SS+00:00.
+        Returns empty string if the string argument passed to the function is not a datetime.
+        See: https://en.wikipedia.org/wiki/ISO_8601
+
+        Returns:
+                str: Properly formatted date/time recieved or empty string.
+        """
+        try:
+            # This date is never meant to be used. The default attribute is just to set timezone.
+            parsedDate = parse(date, default=datetime.datetime(
+                1970, 1, 1, tzinfo=tz.gettz('EDT')))
+        except:
+            return ""
+
+        parsedDateString = parsedDate.strftime("%Y-%m-%dT%H:%M:%S%z")
+
+        return parsedDateString
+
+    def toJson(self) -> dict:
+        """Returns a JSON safe representation of the item.
+
+        Returns:
+                dict: JSON safe representation of the item.
+        """
+        return self.jsonData
+
+    def __repr__(self) -> str:
+        return self.queue + str(self.number)
\ No newline at end of file
diff --git a/src/webqueue2api/__init__.py b/src/webqueue2api/__init__.py
new file mode 100644
index 0000000..9f47c15
--- /dev/null
+++ b/src/webqueue2api/__init__.py
@@ -0,0 +1 @@
+from webqueue2api.Item import Item
\ No newline at end of file

From 98d05447f9dbb940b5962f5a7b1faf28381e16ee Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Fri, 28 May 2021 14:37:20 -0400
Subject: [PATCH 04/75] Create Queue module in webqueue2api package

---
 src/webqueue2api/Queue.py    | 83 ++++++++++++++++++++++++++++++++++++
 src/webqueue2api/__init__.py |  3 +-
 2 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 src/webqueue2api/Queue.py

diff --git a/src/webqueue2api/Queue.py b/src/webqueue2api/Queue.py
new file mode 100644
index 0000000..00fb36c
--- /dev/null
+++ b/src/webqueue2api/Queue.py
@@ -0,0 +1,83 @@
+import os, re
+from .Item import Item
+
+def isValidItemName(name: str) -> bool:
+    """Returns true if file name is a valid item name
+
+    Example:
+            isValidItemName("21") -> true
+            isValidItemName("twentyone") -> false
+
+    Args:
+            name (str): The name to test.
+
+    Returns:
+            bool: Name is valid item name.
+    """
+    itemPattern = re.compile("^[0123456789]{1,3}$")
+    return True if itemPattern.match(name) else False
+
+queueDirectory = "/home/pier/e/queue/Mail"
+
+class Queue:
+    """A collection of items.
+
+    Example:
+            # Create a queue (ce)
+            >>> queue = Queue("ce")
+
+    Attributes:
+            name: The name of the queue.
+            items: A list of Items in the queue.
+            jsonData: A JSON serializable representation of the Queue.
+    """
+
+    def __init__(self, name: str) -> None:
+        self.name = name
+        self.__directory = queueDirectory + "/" + self.name + "/"
+        self.items = self.__getItems()
+
+        self.jsonData = {
+            "name": self.name,
+            "length": len(self)
+        }
+
+    def __getItems(self) -> list:
+        """Returns a list of items for this Queue
+
+        Returns:
+                list: a list of items for this Queue
+        """
+        items = []
+
+        for item in os.listdir(self.__directory):
+            itemPath = self.__directory + "/" + item
+
+            isFile = True if os.path.isfile(itemPath) else False
+
+            if isFile and isValidItemName(item):
+                items.append(Item(self.name, item))
+
+        return items
+
+    def toJson(self) -> dict:
+        """Return JSON safe representation of the Queue
+
+        The JSON representation of every item in the Queue is added to the
+        Queue's JSON data then the Queue's JSON data is returned.
+
+        Returns:
+                dict: JSON safe representation of the Queue
+        """
+        items = []
+        for item in self.items:
+            items.append(item.toJson())
+        self.jsonData["items"] = items
+
+        return self.jsonData
+
+    def __len__(self) -> int:
+        return len(self.items)
+
+    def __repr__(self) -> str:
+        return f'{self.name}_queue'
\ No newline at end of file
diff --git a/src/webqueue2api/__init__.py b/src/webqueue2api/__init__.py
index 9f47c15..7c4e36d 100644
--- a/src/webqueue2api/__init__.py
+++ b/src/webqueue2api/__init__.py
@@ -1 +1,2 @@
-from webqueue2api.Item import Item
\ No newline at end of file
+from webqueue2api.Item import Item
+from webqueue2api.Queue import Queue
\ No newline at end of file

From 2ed14897fd08ae97e957c7f0737c9b20b782844d Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Tue, 1 Jun 2021 16:02:29 -0400
Subject: [PATCH 05/75] Move isValidItemName func to Utilities module

---
 src/webqueue2api/Queue.py     | 19 ++-----------------
 src/webqueue2api/Utilities.py | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 src/webqueue2api/Utilities.py

diff --git a/src/webqueue2api/Queue.py b/src/webqueue2api/Queue.py
index 00fb36c..4794f62 100644
--- a/src/webqueue2api/Queue.py
+++ b/src/webqueue2api/Queue.py
@@ -1,21 +1,6 @@
-import os, re
+import os
 from .Item import Item
-
-def isValidItemName(name: str) -> bool:
-    """Returns true if file name is a valid item name
-
-    Example:
-            isValidItemName("21") -> true
-            isValidItemName("twentyone") -> false
-
-    Args:
-            name (str): The name to test.
-
-    Returns:
-            bool: Name is valid item name.
-    """
-    itemPattern = re.compile("^[0123456789]{1,3}$")
-    return True if itemPattern.match(name) else False
+from .Utilities import isValidItemName
 
 queueDirectory = "/home/pier/e/queue/Mail"
 
diff --git a/src/webqueue2api/Utilities.py b/src/webqueue2api/Utilities.py
new file mode 100644
index 0000000..437cc2b
--- /dev/null
+++ b/src/webqueue2api/Utilities.py
@@ -0,0 +1,20 @@
+"""A collection of utilities to be used throughout the webqueue2 API.
+"""
+
+import re
+
+def isValidItemName(name: str) -> bool:
+    """Returns true if file name is a valid item name
+
+    Example:
+            isValidItemName("21") -> true
+            isValidItemName("twentyone") -> false
+
+    Args:
+            name (str): The name to test.
+
+    Returns:
+            bool: Name is valid item name.
+    """
+    itemPattern = re.compile("^[0123456789]{1,3}$")
+    return True if itemPattern.match(name) else False
\ No newline at end of file

From 7972440b4dedc58299847cdb4075c1b0c98104e5 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 2 Jun 2021 14:57:46 -0400
Subject: [PATCH 06/75] Move Item and Queue classes to parser subpackage

---
 src/webqueue2api/__init__.py                           | 4 ++--
 src/webqueue2api/parser/__init__.py                    | 0
 src/webqueue2api/{Item.py => parser/item.py}           | 0
 src/webqueue2api/{Queue.py => parser/queue.py}         | 4 ++--
 src/webqueue2api/{Utilities.py => parser/utilities.py} | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 src/webqueue2api/parser/__init__.py
 rename src/webqueue2api/{Item.py => parser/item.py} (100%)
 rename src/webqueue2api/{Queue.py => parser/queue.py} (93%)
 rename src/webqueue2api/{Utilities.py => parser/utilities.py} (100%)

diff --git a/src/webqueue2api/__init__.py b/src/webqueue2api/__init__.py
index 7c4e36d..ec1f6df 100644
--- a/src/webqueue2api/__init__.py
+++ b/src/webqueue2api/__init__.py
@@ -1,2 +1,2 @@
-from webqueue2api.Item import Item
-from webqueue2api.Queue import Queue
\ No newline at end of file
+from webqueue2api.parser.item import Item
+from webqueue2api.parser.queue import Queue
\ No newline at end of file
diff --git a/src/webqueue2api/parser/__init__.py b/src/webqueue2api/parser/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/webqueue2api/Item.py b/src/webqueue2api/parser/item.py
similarity index 100%
rename from src/webqueue2api/Item.py
rename to src/webqueue2api/parser/item.py
diff --git a/src/webqueue2api/Queue.py b/src/webqueue2api/parser/queue.py
similarity index 93%
rename from src/webqueue2api/Queue.py
rename to src/webqueue2api/parser/queue.py
index 4794f62..2c7a135 100644
--- a/src/webqueue2api/Queue.py
+++ b/src/webqueue2api/parser/queue.py
@@ -1,6 +1,6 @@
 import os
-from .Item import Item
-from .Utilities import isValidItemName
+from .item import Item
+from .utilities import isValidItemName
 
 queueDirectory = "/home/pier/e/queue/Mail"
 
diff --git a/src/webqueue2api/Utilities.py b/src/webqueue2api/parser/utilities.py
similarity index 100%
rename from src/webqueue2api/Utilities.py
rename to src/webqueue2api/parser/utilities.py

From 45813b65a816edde2a420d1365f56e507dce1909 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 2 Jun 2021 15:17:20 -0400
Subject: [PATCH 07/75] Add getValidQueues function to parser utilities

---
 src/webqueue2api/parser/utilities.py | 33 ++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/webqueue2api/parser/utilities.py b/src/webqueue2api/parser/utilities.py
index 437cc2b..2baa224 100644
--- a/src/webqueue2api/parser/utilities.py
+++ b/src/webqueue2api/parser/utilities.py
@@ -1,7 +1,14 @@
 """A collection of utilities to be used throughout the webqueue2 API.
 """
+import re, os
+
+
+#------------------------------------------------------------------------------#
+# Configuration
+#------------------------------------------------------------------------------#
+queueDirectory = "/home/pier/e/queue/Mail"
+
 
-import re
 
 def isValidItemName(name: str) -> bool:
     """Returns true if file name is a valid item name
@@ -17,4 +24,26 @@ def isValidItemName(name: str) -> bool:
             bool: Name is valid item name.
     """
     itemPattern = re.compile("^[0123456789]{1,3}$")
-    return True if itemPattern.match(name) else False
\ No newline at end of file
+    return True if itemPattern.match(name) else False
+
+queuesToIgnore = ["archives", "drafts", "inbox", "coral"]
+def getValidQueues() -> list:
+    """Returns a list of queues on the filesystem excluding ignored queues.
+
+    Example:
+            ["bidc", "me", "ce"]
+
+    Returns:
+            list: Valid queues
+    """
+    queues = []
+
+    for file in os.listdir(queueDirectory):
+        currentFile = queueDirectory + "/" + file
+        isDirectory = os.path.isdir(currentFile)
+        isValid = file not in queuesToIgnore
+
+        if isDirectory and isValid:
+            queues.append(file)
+
+    return queues
\ No newline at end of file

From 487f9df29d0fccc4f7a9364124524bbc6a75ef6e Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 2 Jun 2021 15:20:02 -0400
Subject: [PATCH 08/75] Add getQueueCounts and loadQueues functions to
 utilities

---
 src/webqueue2api/parser/utilities.py | 45 +++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/webqueue2api/parser/utilities.py b/src/webqueue2api/parser/utilities.py
index 2baa224..e0f7b73 100644
--- a/src/webqueue2api/parser/utilities.py
+++ b/src/webqueue2api/parser/utilities.py
@@ -46,4 +46,47 @@ def getValidQueues() -> list:
         if isDirectory and isValid:
             queues.append(file)
 
-    return queues
\ No newline at end of file
+    return queues
+
+def getQueueCounts() -> list:
+    """Returns a list of dictionaries with the number of items in each queue.
+
+    Example:
+            [
+                {
+                    name: "me",
+                    number_of_items: 42
+                },
+                {
+                    name: "bidc",
+                    number_of_items: 3
+                }
+            ]
+
+    Returns:
+            list: Dictionaries with the number of items in each queue.
+    """
+    queueInfo = []
+    for queue in getValidQueues():
+        possibleItems = os.listdir(queueDirectory + "/" + queue)
+        validItems = [isValidItemName for file in possibleItems]
+        queueInfo.append( {"name": queue, "number_of_items": len(validItems)} )
+    
+    # Sorts list of queue info alphabetically
+    sortedQueueInfo = sorted(queueInfo, key = lambda queueInfoList: queueInfoList['name'])
+
+    return sortedQueueInfo
+        
+
+def loadQueues() -> list:
+    """Return a list of Queues for each queue.
+
+    Returns:
+        list: list of Queues for each queue.
+    """
+    queues = []
+
+    for queue in getValidQueues():
+        queues.append(Queue(queue))
+
+    return queuesG
\ No newline at end of file

From 6786acf0a24bbee7e302ab233f9e0dc73a71ad1a Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 7 Jun 2021 15:24:45 -0400
Subject: [PATCH 09/75] Move utility functions to queue module

---
 src/webqueue2api/parser/queue.py     | 100 ++++++++++++++++++++++++++-
 src/webqueue2api/parser/utilities.py |  92 ------------------------
 2 files changed, 97 insertions(+), 95 deletions(-)
 delete mode 100644 src/webqueue2api/parser/utilities.py

diff --git a/src/webqueue2api/parser/queue.py b/src/webqueue2api/parser/queue.py
index 2c7a135..01bf783 100644
--- a/src/webqueue2api/parser/queue.py
+++ b/src/webqueue2api/parser/queue.py
@@ -1,9 +1,19 @@
-import os
+import os, re
 from .item import Item
-from .utilities import isValidItemName
 
+
+
+#------------------------------------------------------------------------------#
+# Configuration
+#------------------------------------------------------------------------------#
 queueDirectory = "/home/pier/e/queue/Mail"
+queuesToIgnore = ["archives", "drafts", "inbox", "coral"]
+
+
 
+#------------------------------------------------------------------------------#
+# Classes
+#------------------------------------------------------------------------------#
 class Queue:
     """A collection of items.
 
@@ -65,4 +75,88 @@ def __len__(self) -> int:
         return len(self.items)
 
     def __repr__(self) -> str:
-        return f'{self.name}_queue'
\ No newline at end of file
+        return f'{self.name}_queue'
+
+
+
+#------------------------------------------------------------------------------#
+# Utilities
+#------------------------------------------------------------------------------#
+def isValidItemName(name: str) -> bool:
+    """Returns true if file name is a valid item name
+
+    Example:
+            isValidItemName("21") -> true
+            isValidItemName("twentyone") -> false
+
+    Args:
+            name (str): The name to test.
+
+    Returns:
+            bool: Name is valid item name.
+    """
+    itemPattern = re.compile("^[0123456789]{1,3}$")
+    return True if itemPattern.match(name) else False
+
+def getValidQueues() -> list:
+    """Returns a list of queues on the filesystem excluding ignored queues.
+
+    Example:
+            ["bidc", "me", "ce"]
+
+    Returns:
+            list: Valid queues
+    """
+    queues = []
+
+    for file in os.listdir(queueDirectory):
+        currentFile = queueDirectory + "/" + file
+        isDirectory = os.path.isdir(currentFile)
+        isValid = file not in queuesToIgnore
+
+        if isDirectory and isValid:
+            queues.append(file)
+
+    return queues
+
+def getQueueCounts() -> list:
+    """Returns a list of dictionaries with the number of items in each queue.
+
+    Example:
+            [
+                {
+                    name: "me",
+                    number_of_items: 42
+                },
+                {
+                    name: "bidc",
+                    number_of_items: 3
+                }
+            ]
+
+    Returns:
+            list: Dictionaries with the number of items in each queue.
+    """
+    queueInfo = []
+    for queue in getValidQueues():
+        possibleItems = os.listdir(queueDirectory + "/" + queue)
+        validItems = [isValidItemName for file in possibleItems]
+        queueInfo.append( {"name": queue, "number_of_items": len(validItems)} )
+    
+    # Sorts list of queue info alphabetically
+    sortedQueueInfo = sorted(queueInfo, key = lambda queueInfoList: queueInfoList['name'])
+
+    return sortedQueueInfo
+
+def loadQueues() -> list:
+    """Return a list of Queues for each queue.
+
+    Returns:
+        list: list of Queues for each queue.
+    """
+    queues = []
+
+    for queue in getValidQueues():
+        queues.append(Queue(queue))
+
+    return queues
\ No newline at end of file
diff --git a/src/webqueue2api/parser/utilities.py b/src/webqueue2api/parser/utilities.py
deleted file mode 100644
index e0f7b73..0000000
--- a/src/webqueue2api/parser/utilities.py
+++ /dev/null
@@ -1,92 +0,0 @@
-"""A collection of utilities to be used throughout the webqueue2 API.
-"""
-import re, os
-
-
-#------------------------------------------------------------------------------#
-# Configuration
-#------------------------------------------------------------------------------#
-queueDirectory = "/home/pier/e/queue/Mail"
-
-
-
-def isValidItemName(name: str) -> bool:
-    """Returns true if file name is a valid item name
-
-    Example:
-            isValidItemName("21") -> true
-            isValidItemName("twentyone") -> false
-
-    Args:
-            name (str): The name to test.
-
-    Returns:
-            bool: Name is valid item name.
-    """
-    itemPattern = re.compile("^[0123456789]{1,3}$")
-    return True if itemPattern.match(name) else False
-
-queuesToIgnore = ["archives", "drafts", "inbox", "coral"]
-def getValidQueues() -> list:
-    """Returns a list of queues on the filesystem excluding ignored queues.
-
-    Example:
-            ["bidc", "me", "ce"]
-
-    Returns:
-            list: Valid queues
-    """
-    queues = []
-
-    for file in os.listdir(queueDirectory):
-        currentFile = queueDirectory + "/" + file
-        isDirectory = os.path.isdir(currentFile)
-        isValid = file not in queuesToIgnore
-
-        if isDirectory and isValid:
-            queues.append(file)
-
-    return queues
-
-def getQueueCounts() -> list:
-    """Returns a list of dictionaries with the number of items in each queue.
-
-    Example:
-            [
-                {
-                    name: "me",
-                    number_of_items: 42
-                },
-                {
-                    name: "bidc",
-                    number_of_items: 3
-                }
-            ]
-
-    Returns:
-            list: Dictionaries with the number of items in each queue.
-    """
-    queueInfo = []
-    for queue in getValidQueues():
-        possibleItems = os.listdir(queueDirectory + "/" + queue)
-        validItems = [isValidItemName for file in possibleItems]
-        queueInfo.append( {"name": queue, "number_of_items": len(validItems)} )
-    
-    # Sorts list of queue info alphabetically
-    sortedQueueInfo = sorted(queueInfo, key = lambda queueInfoList: queueInfoList['name'])
-
-    return sortedQueueInfo
-        
-
-def loadQueues() -> list:
-    """Return a list of Queues for each queue.
-
-    Returns:
-        list: list of Queues for each queue.
-    """
-    queues = []
-
-    for queue in getValidQueues():
-        queues.append(Queue(queue))
-
-    return queuesG
\ No newline at end of file

From 77d286f1a5ebeebae936c3192f0722562303322a Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 7 Jun 2021 15:25:10 -0400
Subject: [PATCH 10/75] Add section comments to item module

---
 src/webqueue2api/parser/item.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/webqueue2api/parser/item.py b/src/webqueue2api/parser/item.py
index d5bcdf9..2f1e053 100644
--- a/src/webqueue2api/parser/item.py
+++ b/src/webqueue2api/parser/item.py
@@ -7,8 +7,18 @@
 from dateutil import tz
 from typing import Union
 
+
+
+#------------------------------------------------------------------------------#
+# Configuration
+#------------------------------------------------------------------------------#
 queueDirectory = "/home/pier/e/queue/Mail"
 
+
+
+#------------------------------------------------------------------------------#
+# Classes
+#------------------------------------------------------------------------------#
 class Item:
     """A single issue.
 

From 92f737708673a9174c3a0433cdc9640183f941b5 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 7 Jun 2021 15:31:14 -0400
Subject: [PATCH 11/75] Refine exports

---
 src/webqueue2api/__init__.py        | 5 +++--
 src/webqueue2api/parser/__init__.py | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/webqueue2api/__init__.py b/src/webqueue2api/__init__.py
index ec1f6df..263e38a 100644
--- a/src/webqueue2api/__init__.py
+++ b/src/webqueue2api/__init__.py
@@ -1,2 +1,3 @@
-from webqueue2api.parser.item import Item
-from webqueue2api.parser.queue import Queue
\ No newline at end of file
+from webqueue2api.parser import Item
+from webqueue2api.parser import Queue
+from webqueue2api.parser import loadQueues
\ No newline at end of file
diff --git a/src/webqueue2api/parser/__init__.py b/src/webqueue2api/parser/__init__.py
index e69de29..788e1d5 100644
--- a/src/webqueue2api/parser/__init__.py
+++ b/src/webqueue2api/parser/__init__.py
@@ -0,0 +1,6 @@
+# Classes
+from .item import Item
+from .queue import Queue
+
+# Utilities
+from .queue import loadQueues
\ No newline at end of file

From f060381a2c8a7f69d074bf2e742ff3d430aae83b Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 9 Jun 2021 11:51:31 -0400
Subject: [PATCH 12/75] Simplify import statement

---
 src/webqueue2api/__init__.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/webqueue2api/__init__.py b/src/webqueue2api/__init__.py
index 263e38a..cf8d4fe 100644
--- a/src/webqueue2api/__init__.py
+++ b/src/webqueue2api/__init__.py
@@ -1,3 +1 @@
-from webqueue2api.parser import Item
-from webqueue2api.parser import Queue
-from webqueue2api.parser import loadQueues
\ No newline at end of file
+from webqueue2api.parser import Item, Queue, loadQueues
\ No newline at end of file

From e3164aaa5ac5aa9a6ad1d64cbf474bfccc765785 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 9 Jun 2021 14:55:43 -0400
Subject: [PATCH 13/75] Remove logging and allow packages installed from src
 directory

---
 setup.py | 81 ++++++++++++++++++++++++--------------------------------
 1 file changed, 34 insertions(+), 47 deletions(-)

diff --git a/setup.py b/setup.py
index bc5fc39..0d4f679 100644
--- a/setup.py
+++ b/setup.py
@@ -1,46 +1,34 @@
-import setuptools, logging
-from pathlib import Path
-
-# Configure the logger
-logger_name = "webqueueapi_install_log"
-logger = logging.getLogger(logger_name)
-logger.setLevel(logging.DEBUG)
-
-# See Formatting Details: https://docs.python.org/3/library/logging.html#logrecord-attributes
-# Example: Jan 28 2021 12:19:28 venv-manager : [INFO] Message
-log_message_format = "%(asctime)s %(name)s : [%(levelname)s] %(message)s"
-# See Time Formatting Details: https://docs.python.org/3.6/library/time.html#time.strftime
-# Example: Jan 28 2021 12:19:28
-log_time_format = "%b %d %Y %H:%M:%S"
-log_formatter = logging.Formatter(log_message_format, log_time_format)
-
-# Configure output to stdout
-stream_handler = logging.StreamHandler()
-stream_handler.setFormatter(log_formatter)
-stream_handler.setLevel(logging.INFO)
-logger.addHandler(stream_handler)
-
-# Configure out to logfile, located in '/tmp/webqueueapi install log.log'
-log_file_path = Path(f"/tmp/{logger_name}.log")
-file_handler = logging.FileHandler(log_file_path)
-file_handler.setFormatter(log_formatter)
-logger.addHandler(file_handler)
-
-logger.debug("Attempting to install webqueue2-api package")
-
-setuptools.setup(
-    name="webqueue2-api",
+from setuptools import setup, find_packages
+
+# Define Dependencies for Extra Requires
+conditional_dependencies = {
+    "dev":[
+        "pylint"
+    ],
+    "docs": [
+        "mkdocs",
+        "mkdocs-material",
+        "mkautodoc",
+        "mkdocs-awesome-pages-plugin"
+    ],
+}
+
+def get_all_dependencies():
+    """Returns a single array of all dependencies."""
+    dependencies = []
+    for condition in conditional_dependencies.keys():
+        dependencies += conditional_dependencies[condition]
+    return dependencies
+
+setup(
+    name="webqueue2api",
     version="0.9.1",
     description="A library for managing Purdue ECN's queue system.",
-    py_modules=['api', 'ECNQueue'],
     python_requires='>=3.6',
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
     install_requires = [
-        # General Utilities
-        "pipdeptree",
         "gunicorn",
-        "pylint",
-
-        # API 
         "python-dotenv",
         "Flask-RESTful",
         "python-dateutil",
@@ -49,12 +37,11 @@
         "PyJWT == 1.*",
         # Custom version of python-ldap without SASL requirements
         "python-ldap @ git+https://github.itap.purdue.edu/ECN/python-ldap/@python-ldap-3.3.1",
-
-        # API Documentation
-        "mkdocs",
-        "mkdocs-material",
-        "mkautodoc"
-    ]
-)
-
-logger.info("webqueue2-api package installed sucessfully")
\ No newline at end of file
+        "easyad",
+    ],
+    extras_require={
+        "dev": conditional_dependencies["dev"],
+        "docs": conditional_dependencies["docs"],
+        "all": get_all_dependencies()
+    }
+)
\ No newline at end of file

From 9f545fe9089a8ffb8a27d23527f21f11c80f21c4 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 10 Jun 2021 14:39:49 -0400
Subject: [PATCH 14/75] Create config module for parser package

---
 src/webqueue2api/parser/config.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 src/webqueue2api/parser/config.py

diff --git a/src/webqueue2api/parser/config.py b/src/webqueue2api/parser/config.py
new file mode 100644
index 0000000..bb7c10a
--- /dev/null
+++ b/src/webqueue2api/parser/config.py
@@ -0,0 +1,10 @@
+"""Stores parser configuartion data."""
+from dataclasses import dataclass
+
+@dataclass
+class Configuraton:
+    queue_directory: str
+
+config = Configuraton(
+    queue_directory = "/home/pier/e/queue/Mail"
+)
\ No newline at end of file

From b67ee91b1b861c4e756ad6f3ae981270519caa0e Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 10 Jun 2021 14:48:18 -0400
Subject: [PATCH 15/75] Replace hardcoded config in Item with package config
 value

---
 src/webqueue2api/parser/item.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/webqueue2api/parser/item.py b/src/webqueue2api/parser/item.py
index 2f1e053..1b57245 100644
--- a/src/webqueue2api/parser/item.py
+++ b/src/webqueue2api/parser/item.py
@@ -6,13 +6,7 @@
 from dateutil.parser import parse
 from dateutil import tz
 from typing import Union
-
-
-
-#------------------------------------------------------------------------------#
-# Configuration
-#------------------------------------------------------------------------------#
-queueDirectory = "/home/pier/e/queue/Mail"
+from .config import config
 
 
 
@@ -51,7 +45,7 @@ def __init__(self, queue: str, number: int) -> None:
             raise ValueError(" Could not convert \"" +
                              number + "\" to an integer")
 
-        self.__path = "/".join([queueDirectory, self.queue, str(self.number)])
+        self.__path = "/".join([config.queue_directory, self.queue, str(self.number)])
         self.lastUpdated = self.__getLastUpdated()
         self.__rawItem = self.__getRawItem()
         self.headers = self.__parseHeaders()

From b834d865ce974989b7a8f3e3ba1fd6a4f36ebbd6 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 10 Jun 2021 14:48:47 -0400
Subject: [PATCH 16/75] Add queues_to_ignore to parser config

---
 src/webqueue2api/parser/config.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/webqueue2api/parser/config.py b/src/webqueue2api/parser/config.py
index bb7c10a..d349d42 100644
--- a/src/webqueue2api/parser/config.py
+++ b/src/webqueue2api/parser/config.py
@@ -4,7 +4,9 @@
 @dataclass
 class Configuraton:
     queue_directory: str
+    queues_to_ignore = list
 
 config = Configuraton(
-    queue_directory = "/home/pier/e/queue/Mail"
+    queue_directory = "/home/pier/e/queue/Mail",
+    queues_to_ignore = ["archives", "drafts", "inbox", "coral"]
 )
\ No newline at end of file

From 4685c302efdfc41d6873816579326c43913222a6 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 10 Jun 2021 14:50:36 -0400
Subject: [PATCH 17/75] Replace hardcoded config in Queue with package config
 value

---
 src/webqueue2api/parser/queue.py | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/webqueue2api/parser/queue.py b/src/webqueue2api/parser/queue.py
index 01bf783..1d65674 100644
--- a/src/webqueue2api/parser/queue.py
+++ b/src/webqueue2api/parser/queue.py
@@ -1,13 +1,6 @@
 import os, re
 from .item import Item
-
-
-
-#------------------------------------------------------------------------------#
-# Configuration
-#------------------------------------------------------------------------------#
-queueDirectory = "/home/pier/e/queue/Mail"
-queuesToIgnore = ["archives", "drafts", "inbox", "coral"]
+from .config import config
 
 
 
@@ -29,7 +22,7 @@ class Queue:
 
     def __init__(self, name: str) -> None:
         self.name = name
-        self.__directory = queueDirectory + "/" + self.name + "/"
+        self.__directory = config.queue_directory + "/" + self.name + "/"
         self.items = self.__getItems()
 
         self.jsonData = {
@@ -109,10 +102,10 @@ def getValidQueues() -> list:
     """
     queues = []
 
-    for file in os.listdir(queueDirectory):
-        currentFile = queueDirectory + "/" + file
+    for file in os.listdir(config.queue_directory):
+        currentFile = config.queue_directory + "/" + file
         isDirectory = os.path.isdir(currentFile)
-        isValid = file not in queuesToIgnore
+        isValid = file not in config.queues_to_ignore
 
         if isDirectory and isValid:
             queues.append(file)
@@ -139,7 +132,7 @@ def getQueueCounts() -> list:
     """
     queueInfo = []
     for queue in getValidQueues():
-        possibleItems = os.listdir(queueDirectory + "/" + queue)
+        possibleItems = os.listdir(config.queue_directory + "/" + queue)
         validItems = [isValidItemName for file in possibleItems]
         queueInfo.append( {"name": queue, "number_of_items": len(validItems)} )
     

From 7234882389f337a37497146dae3cbd5fcb84bb55 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 10 Jun 2021 14:55:21 -0400
Subject: [PATCH 18/75] Correct parser config class

---
 src/webqueue2api/parser/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webqueue2api/parser/config.py b/src/webqueue2api/parser/config.py
index d349d42..76da15a 100644
--- a/src/webqueue2api/parser/config.py
+++ b/src/webqueue2api/parser/config.py
@@ -4,7 +4,7 @@
 @dataclass
 class Configuraton:
     queue_directory: str
-    queues_to_ignore = list
+    queues_to_ignore: list
 
 config = Configuraton(
     queue_directory = "/home/pier/e/queue/Mail",

From 3aca5fe3429cd4dc62be5b5ccd84ef75d62a3d8e Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 10 Jun 2021 14:55:59 -0400
Subject: [PATCH 19/75] Export parser package config

---
 src/webqueue2api/parser/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/webqueue2api/parser/__init__.py b/src/webqueue2api/parser/__init__.py
index 788e1d5..4b4f038 100644
--- a/src/webqueue2api/parser/__init__.py
+++ b/src/webqueue2api/parser/__init__.py
@@ -3,4 +3,7 @@
 from .queue import Queue
 
 # Utilities
-from .queue import loadQueues
\ No newline at end of file
+from .queue import loadQueues
+
+# Configuration
+from .config import config
\ No newline at end of file

From 57de1c5bc648d0f3e4a06b5581b250a1eebe575a Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 10 Jun 2021 14:56:31 -0400
Subject: [PATCH 20/75] Create webqueue2api package config

---
 src/webqueue2api/config.py | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/webqueue2api/config.py

diff --git a/src/webqueue2api/config.py b/src/webqueue2api/config.py
new file mode 100644
index 0000000..fc78290
--- /dev/null
+++ b/src/webqueue2api/config.py
@@ -0,0 +1,11 @@
+from dataclasses import dataclass
+from dataclasses import dataclass
+import webqueue2api.parser.config
+
+@dataclass
+class Configuration:
+    parser: dataclass
+
+config = Configuration(
+    parser = webqueue2api.parser.config
+)
\ No newline at end of file

From d1682ca74cc8c10fa30b3cd9b27360fa31b0dd54 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 10 Jun 2021 14:56:46 -0400
Subject: [PATCH 21/75] Export webqueue2api package config

---
 src/webqueue2api/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/webqueue2api/__init__.py b/src/webqueue2api/__init__.py
index cf8d4fe..77e2891 100644
--- a/src/webqueue2api/__init__.py
+++ b/src/webqueue2api/__init__.py
@@ -1 +1,2 @@
-from webqueue2api.parser import Item, Queue, loadQueues
\ No newline at end of file
+from webqueue2api.parser import Item, Queue, loadQueues
+from .config import config
\ No newline at end of file

From 5d09a1dc9724b7d707f38259c5970bb2fb3cb80e Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 10 Jun 2021 14:57:06 -0400
Subject: [PATCH 22/75] Add dataclasses library to setup file

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 0d4f679..83a43c5 100644
--- a/setup.py
+++ b/setup.py
@@ -38,6 +38,7 @@ def get_all_dependencies():
         # Custom version of python-ldap without SASL requirements
         "python-ldap @ git+https://github.itap.purdue.edu/ECN/python-ldap/@python-ldap-3.3.1",
         "easyad",
+        "dataclasses"
     ],
     extras_require={
         "dev": conditional_dependencies["dev"],

From 90abd36f25e876fdd6c30f78f073579b0602a292 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Tue, 15 Jun 2021 15:52:00 -0400
Subject: [PATCH 23/75] Create api sub-package skeleton with blank config

---
 src/webqueue2api/api/__init__.py |  2 ++
 src/webqueue2api/api/config.py   | 11 +++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 src/webqueue2api/api/__init__.py
 create mode 100644 src/webqueue2api/api/config.py

diff --git a/src/webqueue2api/api/__init__.py b/src/webqueue2api/api/__init__.py
new file mode 100644
index 0000000..4bc8e87
--- /dev/null
+++ b/src/webqueue2api/api/__init__.py
@@ -0,0 +1,2 @@
+# Configuration
+from .config import config
\ No newline at end of file
diff --git a/src/webqueue2api/api/config.py b/src/webqueue2api/api/config.py
new file mode 100644
index 0000000..4d41fac
--- /dev/null
+++ b/src/webqueue2api/api/config.py
@@ -0,0 +1,11 @@
+"""Stores API configuartion data."""
+from dataclasses import dataclass
+
+@dataclass
+class Configuraton:
+    pass
+    
+
+config = Configuraton(
+    
+)
\ No newline at end of file

From c17647d86acff4432579fbb69c7c3d189b0f3f2b Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Tue, 15 Jun 2021 15:52:17 -0400
Subject: [PATCH 24/75] Add api config to webqueue2api config

---
 src/webqueue2api/config.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/webqueue2api/config.py b/src/webqueue2api/config.py
index fc78290..20da74f 100644
--- a/src/webqueue2api/config.py
+++ b/src/webqueue2api/config.py
@@ -1,11 +1,13 @@
 from dataclasses import dataclass
-from dataclasses import dataclass
 import webqueue2api.parser.config
+import webqueue2api.api.config
 
 @dataclass
 class Configuration:
     parser: dataclass
+    api: dataclass
 
 config = Configuration(
-    parser = webqueue2api.parser.config
+    parser = webqueue2api.parser.config,
+    api = webqueue2api.api.config
 )
\ No newline at end of file

From 0d38b4f54b59df0cd0121bf5523b0d4f90e9212e Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 14:12:51 -0400
Subject: [PATCH 25/75] Add generate_random_string function to API config

---
 src/webqueue2api/api/config.py | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/webqueue2api/api/config.py b/src/webqueue2api/api/config.py
index 4d41fac..ed6dc09 100644
--- a/src/webqueue2api/api/config.py
+++ b/src/webqueue2api/api/config.py
@@ -1,11 +1,30 @@
 """Stores API configuartion data."""
 from dataclasses import dataclass
+import random, string
+
+
+
+def generate_random_string(length=16) -> str:
+    """Generate random string of letters and numbers of specified length.
+
+    Example:
+        generate_random_string() -> "aud04ki947rrje3k9"
+
+    Args:
+        length (int, optional): Number of characters to generate. Defaults to 16.
+
+    Returns:
+        str: Random string.
+    """
+    possible_characters = string.ascii_letters + string.digits + "!@#$%^&*"
+    random_string = ''
+    for number in range(length):
+        random_string += random.choice(possible_characters)
+    return random_string
 
 @dataclass
 class Configuraton:
     pass
-    
-
 config = Configuraton(
     
 )
\ No newline at end of file

From b452e15b051e13c949a813891852e912c03ee331 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 14:13:51 -0400
Subject: [PATCH 26/75] Add jwt_secret_key and environment options to api
 config with defaults

---
 src/webqueue2api/api/config.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/webqueue2api/api/config.py b/src/webqueue2api/api/config.py
index ed6dc09..d16f099 100644
--- a/src/webqueue2api/api/config.py
+++ b/src/webqueue2api/api/config.py
@@ -24,7 +24,16 @@ def generate_random_string(length=16) -> str:
 
 @dataclass
 class Configuraton:
-    pass
-config = Configuraton(
+    """Stores API configuration.
+
+    Args:
+        jwt_secret_key (str): The key used to confirm JWT validity.
+        environment (str): The type of environment to run in. "prod" or "dev"
+    """
+    jwt_secret_key: str
+    environment: str
     
+config = Configuraton(
+    jwt_secret_key = generate_random_string(),
+    environment = "prod"
 )
\ No newline at end of file

From cae26bee33660d02266bddf3f09d9146753e4d80 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 14:14:53 -0400
Subject: [PATCH 27/75] Create app module in api package with Flask config

---
 src/webqueue2api/api/app.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/webqueue2api/api/app.py

diff --git a/src/webqueue2api/api/app.py b/src/webqueue2api/api/app.py
new file mode 100644
index 0000000..d9984c0
--- /dev/null
+++ b/src/webqueue2api/api/app.py
@@ -0,0 +1,30 @@
+from flask import Flask
+from flask_restful import Api
+from flask_jwt_extended import JWTManager
+from .config import config
+
+app = Flask(__name__)
+api = Api(app)
+
+# Set JWT secret key and create JWT manager
+app.config["JWT_SECRET_KEY"] = config.jwt_secret_key
+# The JWT RFC uses the "sub" key for identity claims. However, 
+# Flask-JWT-Extended uses "identity" by default for compatibility reasons so
+# we ovverride the default claim key to comply with the RFC
+app.config["JWT_IDENTITY_CLAIM"] = "sub"
+# Set the key for error messages generated by Flask-JWT-Extended
+app.config["JWT_ERROR_MESSAGE_KEY"] = "message"
+
+# Look for JWTs in headers (for access) then cookies (for refresh)
+app.config["JWT_TOKEN_LOCATION"] = ["headers", "cookies"]
+# Restrict cookies to HTTPS in prod, allow HTTP in dev
+app.config["JWT_COOKIE_SECURE"] = False if config.jwt_secret_key == "dev" else True
+# Restrict cookies using SameSite=strict flag
+app.config["JWT_COOKIE_SAMESITE"] = "strict"
+# Restrict refresh tokens to /token/refresh endpoint
+app.config["JWT_REFRESH_COOKIE_PATH"] = '/tokens/refresh'
+# Set the cookie key for CRSF validation string
+# This is the default value. Adding it for easy reference
+app.config["JWT_REFRESH_CSRF_HEADER_NAME"] = "X-CSRF-TOKEN"
+
+tokenManager = JWTManager(app)
\ No newline at end of file

From a7c325f14451268b3528c01074a583ed0e1fd62d Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 14:15:30 -0400
Subject: [PATCH 28/75] create resources package

---
 src/webqueue2api/api/resources/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/webqueue2api/api/resources/__init__.py

diff --git a/src/webqueue2api/api/resources/__init__.py b/src/webqueue2api/api/resources/__init__.py
new file mode 100644
index 0000000..e69de29

From a4a669bdc608a01ebf7ce3603a41efc1db287ec7 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 14:16:25 -0400
Subject: [PATCH 29/75] Create auth module in api package and add user_is_valid
 function

---
 src/webqueue2api/api/auth.py | 55 ++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 src/webqueue2api/api/auth.py

diff --git a/src/webqueue2api/api/auth.py b/src/webqueue2api/api/auth.py
new file mode 100644
index 0000000..02e5158
--- /dev/null
+++ b/src/webqueue2api/api/auth.py
@@ -0,0 +1,55 @@
+from easyad import EasyAD
+from ldap.filter import escape_filter_chars
+# pylint says this is an error but it works so ¯\_(ツ)_/¯
+from ldap import INVALID_CREDENTIALS as LDAP_INVALID_CREDENTIALS
+
+
+
+def user_is_valid(username: str, password: str) -> bool:
+    """Checks if user is valid and in webqueue2 login group.
+
+    Args:
+        username (str): Career account username.
+        password (str): Career account passphrase.
+
+    Returns:
+        bool: True if user is valid, otherwise False.
+    """
+
+    # Check for empty arguments
+    if (username == "" or password == ""):
+        return False
+
+    # Initialize EasyAD
+    config = {
+        "AD_SERVER": "boilerad.purdue.edu",
+        "AD_DOMAIN": "boilerad.purdue.edu"
+    }
+    ad = EasyAD(config)
+
+    # Prepare search critiera for Active Directory
+    credentials = {
+        "username": escape_filter_chars(username),
+        "password": password
+    }
+    attributes = [ 'cn', "memberOf" ]
+    filter_string = f'(&(objectClass=user)(|(sAMAccountName={username})))'
+
+    # Do user search
+    try:
+        user = ad.search(credentials=credentials, attributes=attributes, filter_string=filter_string)[0]
+    except LDAP_INVALID_CREDENTIALS:
+        return False
+    
+    # Isolate group names
+        # Example:
+        #	'CN=00000227-ECNStuds,OU=BoilerADGroups,DC=BoilerAD,DC=Purdue,DC=edu' becomes
+        # 	`00000227-ECNStuds`
+    user_groups = [ group.split(',')[0].split('=')[1] for group in user["memberOf"] ]
+
+    # Check group membership
+    webqueue_login_group = "00000227-ECN-webqueue"
+    if webqueue_login_group not in user_groups:
+        return False
+
+    return True
\ No newline at end of file

From 86ec831ebaafaeab3f7612f149c2db414abeb3f9 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 14:17:20 -0400
Subject: [PATCH 30/75] Create login resource

---
 src/webqueue2api/api/resources/__init__.py |  1 +
 src/webqueue2api/api/resources/login.py    | 51 ++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 src/webqueue2api/api/resources/login.py

diff --git a/src/webqueue2api/api/resources/__init__.py b/src/webqueue2api/api/resources/__init__.py
index e69de29..751474d 100644
--- a/src/webqueue2api/api/resources/__init__.py
+++ b/src/webqueue2api/api/resources/__init__.py
@@ -0,0 +1 @@
+from .login import Login
\ No newline at end of file
diff --git a/src/webqueue2api/api/resources/login.py b/src/webqueue2api/api/resources/login.py
new file mode 100644
index 0000000..29430f8
--- /dev/null
+++ b/src/webqueue2api/api/resources/login.py
@@ -0,0 +1,51 @@
+from flask import request, after_this_request
+from flask_restful import Resource
+from flask_jwt_extended import create_access_token, create_refresh_token, set_refresh_cookies
+from ..auth import user_is_valid
+
+
+
+class Login(Resource):
+    def post(self) -> tuple:
+        """Validates username/password, sets refresh token cookie and returns access token.
+
+        Return Codes:
+                200 (OK): On success.
+                401 (Unauthroized): When username or password are incorrect.
+                422 (Unprocessable Entitiy): When the username or password can't be parsed.
+
+        Example:
+                curl -X POST
+                    -H "Content-Type: application/json" 
+                    -d '{"username": "bob", "password": "super_secret"}'
+
+                { "access_token": fjr09hfp09h932jp9ruj3.3r8ihf8h0w8hr08ifhj804h8i.8h48ith08ity409hip0t4 }
+
+        Returns:
+                tuple: Response containing tokens and HTTP response code.
+        """
+        if not request.is_json:
+            return ({ "message": "JSON missing from request body"}, 422)
+        
+        data = request.json
+
+        fields_to_check = ["username", "password"]
+        for field in fields_to_check:
+            if field not in data.keys():
+                return ({ "message": f"{field} missing from request body"}, 422)
+        
+        if not user_is_valid(data["username"], data["password"]):
+            return ({ "message": "Username or password is invalid"}, 401)
+
+        access_token = create_access_token(data["username"])
+        refresh_token = create_refresh_token(data["username"])
+
+        # This decorator is needed because Flask-RESTful's 'resourceful routing`
+        # doesn't allow for direct modification to the Flask response object.
+        # See: https://flask-restful.readthedocs.io/en/latest/quickstart.html#resourceful-routing
+        @after_this_request
+        def set_refresh_cookie_callback(response):
+            set_refresh_cookies(response, refresh_token)
+            return response
+
+        return ({ "access_token": access_token }, 200)
\ No newline at end of file

From b50ce98412c1f255c7ef4eb4132b1105c573d932 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 14:17:38 -0400
Subject: [PATCH 31/75] Add login resource to api at /api/login

---
 src/webqueue2api/api/app.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/webqueue2api/api/app.py b/src/webqueue2api/api/app.py
index d9984c0..c77c681 100644
--- a/src/webqueue2api/api/app.py
+++ b/src/webqueue2api/api/app.py
@@ -1,6 +1,7 @@
 from flask import Flask
 from flask_restful import Api
 from flask_jwt_extended import JWTManager
+from .resources import Login
 from .config import config
 
 app = Flask(__name__)
@@ -27,4 +28,6 @@
 # This is the default value. Adding it for easy reference
 app.config["JWT_REFRESH_CSRF_HEADER_NAME"] = "X-CSRF-TOKEN"
 
-tokenManager = JWTManager(app)
\ No newline at end of file
+tokenManager = JWTManager(app)
+
+api.add_resource(Login, "/api/login")
\ No newline at end of file

From 146a192908939f19b58f7ca2df24ad0923b91094 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 14:17:57 -0400
Subject: [PATCH 32/75] Export app in api package

---
 src/webqueue2api/api/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/webqueue2api/api/__init__.py b/src/webqueue2api/api/__init__.py
index 4bc8e87..a78f240 100644
--- a/src/webqueue2api/api/__init__.py
+++ b/src/webqueue2api/api/__init__.py
@@ -1,2 +1,5 @@
+# WSGI App
+from .app import app
+
 # Configuration
 from .config import config
\ No newline at end of file

From 6810fde0d4a4279d399865df6d8fc49d1d15b259 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 14:37:58 -0400
Subject: [PATCH 33/75] Add docstring to parser config

---
 src/webqueue2api/parser/config.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/webqueue2api/parser/config.py b/src/webqueue2api/parser/config.py
index 76da15a..882ef68 100644
--- a/src/webqueue2api/parser/config.py
+++ b/src/webqueue2api/parser/config.py
@@ -3,6 +3,12 @@
 
 @dataclass
 class Configuraton:
+    """Stores parser configuration.
+
+    Args:
+        queue_directory (str): The absolute file path to the queues directory.
+        queues_to_ignore (list): List of queues to ignore when loading all queues.
+    """
     queue_directory: str
     queues_to_ignore: list
 

From 544375a9e1428e646af0488ad79c119755b2dd7a Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 14:48:49 -0400
Subject: [PATCH 34/75] Create RefreshAccessToken resource

---
 src/webqueue2api/api/resources/refresh_access_token.py | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 src/webqueue2api/api/resources/refresh_access_token.py

diff --git a/src/webqueue2api/api/resources/refresh_access_token.py b/src/webqueue2api/api/resources/refresh_access_token.py
new file mode 100644
index 0000000..4a60081
--- /dev/null
+++ b/src/webqueue2api/api/resources/refresh_access_token.py
@@ -0,0 +1,9 @@
+from flask_restful import Resource
+from flask_jwt_extended import jwt_refresh_token_required, get_jwt_identity, create_access_token
+
+class RefreshAccessToken(Resource):
+    @jwt_refresh_token_required
+    def post(self):
+        username = get_jwt_identity()
+        access_token = create_access_token(username)
+        return ({"access_token": access_token}, 200)
\ No newline at end of file

From 9b95871eb3af543c2cc1bde5f6552ed20aa7f3b3 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 14:49:10 -0400
Subject: [PATCH 35/75] Export RefreshAccessToken from resources

---
 src/webqueue2api/api/resources/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/webqueue2api/api/resources/__init__.py b/src/webqueue2api/api/resources/__init__.py
index 751474d..44a310c 100644
--- a/src/webqueue2api/api/resources/__init__.py
+++ b/src/webqueue2api/api/resources/__init__.py
@@ -1 +1,2 @@
-from .login import Login
\ No newline at end of file
+from .login import Login
+from .refresh_access_token import RefreshAccessToken
\ No newline at end of file

From a32b46ede7d7a4b1e169e52d879026d5f49f6b83 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 14:49:49 -0400
Subject: [PATCH 36/75] Add RefreshAccessToken resource to /api/token/refresh
 endpoint

---
 src/webqueue2api/api/app.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/webqueue2api/api/app.py b/src/webqueue2api/api/app.py
index c77c681..5c1b9ad 100644
--- a/src/webqueue2api/api/app.py
+++ b/src/webqueue2api/api/app.py
@@ -1,8 +1,8 @@
 from flask import Flask
 from flask_restful import Api
 from flask_jwt_extended import JWTManager
-from .resources import Login
 from .config import config
+from .resources import Login, RefreshAccessToken
 
 app = Flask(__name__)
 api = Api(app)
@@ -30,4 +30,5 @@
 
 tokenManager = JWTManager(app)
 
-api.add_resource(Login, "/api/login")
\ No newline at end of file
+api.add_resource(Login, "/api/login")
+api.add_resource(RefreshAccessToken, "/api/tokens/refresh")
\ No newline at end of file

From 107828a57dd7467653df7bec551ff4ca9d5e933f Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 15:32:42 -0400
Subject: [PATCH 37/75] Convert item path from string to Path object

---
 src/webqueue2api/parser/item.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/webqueue2api/parser/item.py b/src/webqueue2api/parser/item.py
index 1b57245..3efecaa 100644
--- a/src/webqueue2api/parser/item.py
+++ b/src/webqueue2api/parser/item.py
@@ -6,6 +6,7 @@
 from dateutil.parser import parse
 from dateutil import tz
 from typing import Union
+from pathlib import Path
 from .config import config
 
 
@@ -39,13 +40,13 @@ class Item:
 
     def __init__(self, queue: str, number: int) -> None:
         self.queue = queue
+
         try:
             self.number = int(number)
         except ValueError:
-            raise ValueError(" Could not convert \"" +
-                             number + "\" to an integer")
+            raise ValueError(f"Could not convert {number} to an integer")
 
-        self.__path = "/".join([config.queue_directory, self.queue, str(self.number)])
+        self.__path = Path(config.queue_directory, self.queue, str(self.number))
         self.lastUpdated = self.__getLastUpdated()
         self.__rawItem = self.__getRawItem()
         self.headers = self.__parseHeaders()
@@ -61,7 +62,7 @@ def __init__(self, queue: str, number: int) -> None:
         self.department = self.__getMostRecentHeaderByType("Department")
         self.building = self.__getMostRecentHeaderByType("Building")
         self.dateReceived = self.__getFormattedDate(
-            self.__getMostRecentHeaderByType("Date"))
+        self.__getMostRecentHeaderByType("Date"))
 
         # TODO: Autopopulate jsonData w/ __dir__() command. Exclude `^_` and `jsonData`.
         self.jsonData = {
@@ -995,7 +996,7 @@ def __errorParsing(self, line: str, lineNum: int, expectedSyntax: str) -> dict:
             str(datetime.datetime.now()))
 
         # Item filepath
-        errorDictionary["file_path"] = self.__path
+        errorDictionary["file_path"] = str(self.__path)
 
         # Expected value
         errorDictionary["expected"] = expectedSyntax
@@ -1060,7 +1061,7 @@ def __isLocked(self) -> Union[str, bool]:
         Returns:
                 Union[str, bool]: String with info about lock if true, bool False if false
         """
-        lockFile = self.__path + ".lck"
+        lockFile = str(self.__path) + ".lck"
         if os.path.exists(lockFile):
             with open(lockFile) as file:
                 lockInfo = file.readline().split(" ")

From 7e966e94893422f1dd3181a373e104b4eb78e7a4 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 15:40:42 -0400
Subject: [PATCH 38/75] Create parser errors module and add
 ItemDoesNotExistError

---
 src/webqueue2api/parser/errors.py | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 src/webqueue2api/parser/errors.py

diff --git a/src/webqueue2api/parser/errors.py b/src/webqueue2api/parser/errors.py
new file mode 100644
index 0000000..34bc912
--- /dev/null
+++ b/src/webqueue2api/parser/errors.py
@@ -0,0 +1,4 @@
+class ItemDoesNotExistError(Exception):
+    def __init__(self, path: str):
+        self.message = f"File {path} not found."
+        super().__init__(self.message)
\ No newline at end of file

From afecc472746dc8a93cdaa8898e7212257b83a54f Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 15:40:54 -0400
Subject: [PATCH 39/75] Raise ItemDoesNotExistError if Item is not found

---
 src/webqueue2api/parser/item.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/webqueue2api/parser/item.py b/src/webqueue2api/parser/item.py
index 3efecaa..d4c599f 100644
--- a/src/webqueue2api/parser/item.py
+++ b/src/webqueue2api/parser/item.py
@@ -8,6 +8,7 @@
 from typing import Union
 from pathlib import Path
 from .config import config
+from .errors import ItemDoesNotExistError
 
 
 
@@ -36,6 +37,9 @@ class Item:
             department: The most recent department for this item.
             dateReceived: The date this item was created.
             jsonData: A JSON serializable representation of the Item.
+
+    Raises:
+            ItemDoesNotExistError: If an item does not exist on the filesystem.
     """
 
     def __init__(self, queue: str, number: int) -> None:
@@ -47,6 +51,9 @@ def __init__(self, queue: str, number: int) -> None:
             raise ValueError(f"Could not convert {number} to an integer")
 
         self.__path = Path(config.queue_directory, self.queue, str(self.number))
+        if not self.__path.exists():
+            raise ItemDoesNotExistError(str(self.__path))
+
         self.lastUpdated = self.__getLastUpdated()
         self.__rawItem = self.__getRawItem()
         self.headers = self.__parseHeaders()

From 9e4c10d2cc7cc8e0a0e0114923dca6eac7f9c502 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 16:07:33 -0400
Subject: [PATCH 40/75] Create ItemResource resource

---
 src/webqueue2api/api/resources/item.py | 43 ++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 src/webqueue2api/api/resources/item.py

diff --git a/src/webqueue2api/api/resources/item.py b/src/webqueue2api/api/resources/item.py
new file mode 100644
index 0000000..0981100
--- /dev/null
+++ b/src/webqueue2api/api/resources/item.py
@@ -0,0 +1,43 @@
+from flask_restful import Resource
+from flask_jwt_extended import jwt_required
+from webqueue2api.parser import Item
+from webqueue2api.parser.errors import ItemDoesNotExistError
+
+class ItemResource(Resource):
+    # @jwt_required
+    def get(self, queue: str, number: int) -> tuple:
+        """Returns the JSON representation of the item requested.
+
+        Return Codes:
+                200 (OK): On success.
+
+        Example:
+            /api/ce/100 returns:
+            {
+                "lastUpdated": "07-23-20 10:11 PM",
+                "headers": [...],
+                "content": [...],
+                "isLocked": "ce 100 is locked by knewell using qvi",
+                "userEmail": "campb303@purdue.edu",
+                "userName": "Justin Campbell",
+                "userAlias": "campb303",
+                "assignedTo": "campb303",
+                "subject": "Beepboop",
+                "status": "Dont Delete",
+                "priority": "",
+                "deparment": "",
+                "building": "",
+                "dateReceived": "Tue, 23 Jun 2020 13:25:51 -0400"
+            }
+
+        Args:
+            queue (str): The queue of the item requested.
+            item (int): The number of the item requested.
+
+        Returns:
+            tuple: Item as JSON and HTTP response code.
+        """
+        try:
+            return (Item(queue, number).toJson(), 200)
+        except ItemDoesNotExistError:
+            return ({"message": f"Item {queue}{number} not found."}, 404)
\ No newline at end of file

From 48f37957d1f597f3d55dcc00674b7a72d95d7c1f Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 16:07:48 -0400
Subject: [PATCH 41/75] Export ItemResource from resources

---
 src/webqueue2api/api/resources/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/webqueue2api/api/resources/__init__.py b/src/webqueue2api/api/resources/__init__.py
index 44a310c..92e5ea1 100644
--- a/src/webqueue2api/api/resources/__init__.py
+++ b/src/webqueue2api/api/resources/__init__.py
@@ -1,2 +1,3 @@
 from .login import Login
-from .refresh_access_token import RefreshAccessToken
\ No newline at end of file
+from .refresh_access_token import RefreshAccessToken
+from .item import ItemResource
\ No newline at end of file

From 90a67cbba89c389d4acfafb80bc40dda520ce47d Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 16:08:35 -0400
Subject: [PATCH 42/75] Add ItemResource to /api/data/ path

---
 src/webqueue2api/api/app.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/webqueue2api/api/app.py b/src/webqueue2api/api/app.py
index 5c1b9ad..0be9c55 100644
--- a/src/webqueue2api/api/app.py
+++ b/src/webqueue2api/api/app.py
@@ -2,7 +2,7 @@
 from flask_restful import Api
 from flask_jwt_extended import JWTManager
 from .config import config
-from .resources import Login, RefreshAccessToken
+from .resources import Login, RefreshAccessToken, ItemResource
 
 app = Flask(__name__)
 api = Api(app)
@@ -31,4 +31,5 @@
 tokenManager = JWTManager(app)
 
 api.add_resource(Login, "/api/login")
-api.add_resource(RefreshAccessToken, "/api/tokens/refresh")
\ No newline at end of file
+api.add_resource(RefreshAccessToken, "/api/tokens/refresh")
+api.add_resource(ItemResource, "/api/data/<string:queue>/<int:number>")
\ No newline at end of file

From 10de49fbf19908434799e3b027141f4158964f9f Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 16:12:17 -0400
Subject: [PATCH 43/75] Import parser.Item as _Item and rename ItemResource to
 Item

---
 src/webqueue2api/api/app.py                | 4 ++--
 src/webqueue2api/api/resources/__init__.py | 2 +-
 src/webqueue2api/api/resources/item.py     | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/webqueue2api/api/app.py b/src/webqueue2api/api/app.py
index 0be9c55..486ad81 100644
--- a/src/webqueue2api/api/app.py
+++ b/src/webqueue2api/api/app.py
@@ -2,7 +2,7 @@
 from flask_restful import Api
 from flask_jwt_extended import JWTManager
 from .config import config
-from .resources import Login, RefreshAccessToken, ItemResource
+from .resources import Login, RefreshAccessToken, Item
 
 app = Flask(__name__)
 api = Api(app)
@@ -32,4 +32,4 @@
 
 api.add_resource(Login, "/api/login")
 api.add_resource(RefreshAccessToken, "/api/tokens/refresh")
-api.add_resource(ItemResource, "/api/data/<string:queue>/<int:number>")
\ No newline at end of file
+api.add_resource(Item, "/api/data/<string:queue>/<int:number>")
\ No newline at end of file
diff --git a/src/webqueue2api/api/resources/__init__.py b/src/webqueue2api/api/resources/__init__.py
index 92e5ea1..7e848b0 100644
--- a/src/webqueue2api/api/resources/__init__.py
+++ b/src/webqueue2api/api/resources/__init__.py
@@ -1,3 +1,3 @@
 from .login import Login
 from .refresh_access_token import RefreshAccessToken
-from .item import ItemResource
\ No newline at end of file
+from .item import Item
\ No newline at end of file
diff --git a/src/webqueue2api/api/resources/item.py b/src/webqueue2api/api/resources/item.py
index 0981100..22b60e7 100644
--- a/src/webqueue2api/api/resources/item.py
+++ b/src/webqueue2api/api/resources/item.py
@@ -1,9 +1,10 @@
 from flask_restful import Resource
 from flask_jwt_extended import jwt_required
-from webqueue2api.parser import Item
+# To avoid naming conflicts
+from webqueue2api.parser import Item as _Item
 from webqueue2api.parser.errors import ItemDoesNotExistError
 
-class ItemResource(Resource):
+class Item(Resource):
     # @jwt_required
     def get(self, queue: str, number: int) -> tuple:
         """Returns the JSON representation of the item requested.
@@ -38,6 +39,6 @@ def get(self, queue: str, number: int) -> tuple:
             tuple: Item as JSON and HTTP response code.
         """
         try:
-            return (Item(queue, number).toJson(), 200)
+            return (_Item(queue, number).toJson(), 200)
         except ItemDoesNotExistError:
             return ({"message": f"Item {queue}{number} not found."}, 404)
\ No newline at end of file

From f9713fec9d541ecf405bfd59e0741bf526af44d9 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 17 Jun 2021 10:57:58 -0400
Subject: [PATCH 44/75] Re-enable authentication

---
 src/webqueue2api/api/resources/item.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webqueue2api/api/resources/item.py b/src/webqueue2api/api/resources/item.py
index 22b60e7..85fc9e0 100644
--- a/src/webqueue2api/api/resources/item.py
+++ b/src/webqueue2api/api/resources/item.py
@@ -5,7 +5,7 @@
 from webqueue2api.parser.errors import ItemDoesNotExistError
 
 class Item(Resource):
-    # @jwt_required
+    @jwt_required
     def get(self, queue: str, number: int) -> tuple:
         """Returns the JSON representation of the item requested.
 

From 08748d92125e0c3956c5ffde5a48fd097177c851 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 17 Jun 2021 11:43:22 -0400
Subject: [PATCH 45/75] Create QueueDoesNotExistError

---
 src/webqueue2api/parser/errors.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/webqueue2api/parser/errors.py b/src/webqueue2api/parser/errors.py
index 34bc912..ef1ac48 100644
--- a/src/webqueue2api/parser/errors.py
+++ b/src/webqueue2api/parser/errors.py
@@ -1,4 +1,9 @@
 class ItemDoesNotExistError(Exception):
     def __init__(self, path: str):
         self.message = f"File {path} not found."
+        super().__init__(self.message)
+
+class QueueDoesNotExistError(Exception):
+    def __init__(self, path: str):
+        self.message = f"Directory {path} not found."
         super().__init__(self.message)
\ No newline at end of file

From ab40762f781e2ad824c17a3a173bc6630d3933e8 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 17 Jun 2021 11:45:27 -0400
Subject: [PATCH 46/75] Replace self.__directory with Path object and raise
 QueueDoesNotExistError if queue does not exist

---
 src/webqueue2api/parser/queue.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/webqueue2api/parser/queue.py b/src/webqueue2api/parser/queue.py
index 1d65674..76107f9 100644
--- a/src/webqueue2api/parser/queue.py
+++ b/src/webqueue2api/parser/queue.py
@@ -1,6 +1,8 @@
 import os, re
+from pathlib import Path
 from .item import Item
 from .config import config
+from .errors import QueueDoesNotExistError
 
 
 
@@ -18,11 +20,17 @@ class Queue:
             name: The name of the queue.
             items: A list of Items in the queue.
             jsonData: A JSON serializable representation of the Queue.
+
+    Raises:
+            QueueDoesNotExistError: If a queue's directory does not exist on the filesystem.
     """
 
     def __init__(self, name: str) -> None:
         self.name = name
-        self.__directory = config.queue_directory + "/" + self.name + "/"
+        self.__directory = Path(config.queue_directory, self.name)
+        if not self.__directory.exists():
+            raise QueueDoesNotExistError(str(self.__directory))
+
         self.items = self.__getItems()
 
         self.jsonData = {
@@ -39,9 +47,9 @@ def __getItems(self) -> list:
         items = []
 
         for item in os.listdir(self.__directory):
-            itemPath = self.__directory + "/" + item
+            item_path = Path(self.__directory, item)
 
-            isFile = True if os.path.isfile(itemPath) else False
+            isFile = True if os.path.isfile(item_path) else False
 
             if isFile and isValidItemName(item):
                 items.append(Item(self.name, item))

From ff1326681c4983e896a93f5bb84362d23fe5bdf3 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 17 Jun 2021 12:00:30 -0400
Subject: [PATCH 47/75] Change self.__directory to self.path

---
 src/webqueue2api/parser/queue.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/webqueue2api/parser/queue.py b/src/webqueue2api/parser/queue.py
index 76107f9..2db81a4 100644
--- a/src/webqueue2api/parser/queue.py
+++ b/src/webqueue2api/parser/queue.py
@@ -27,9 +27,9 @@ class Queue:
 
     def __init__(self, name: str) -> None:
         self.name = name
-        self.__directory = Path(config.queue_directory, self.name)
-        if not self.__directory.exists():
-            raise QueueDoesNotExistError(str(self.__directory))
+        self.path = Path(config.queue_directory, self.name)
+        if not self.path.exists():
+            raise QueueDoesNotExistError(str(self.path))
 
         self.items = self.__getItems()
 
@@ -46,8 +46,8 @@ def __getItems(self) -> list:
         """
         items = []
 
-        for item in os.listdir(self.__directory):
-            item_path = Path(self.__directory, item)
+        for item in os.listdir(self.path):
+            item_path = Path(self.path, item)
 
             isFile = True if os.path.isfile(item_path) else False
 

From 89e3ef106ddeed3476d101b6b84399b1072c1c4f Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 17 Jun 2021 12:02:06 -0400
Subject: [PATCH 48/75] Rename self._getItems to self.get_items

---
 src/webqueue2api/parser/queue.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/webqueue2api/parser/queue.py b/src/webqueue2api/parser/queue.py
index 2db81a4..e128932 100644
--- a/src/webqueue2api/parser/queue.py
+++ b/src/webqueue2api/parser/queue.py
@@ -31,14 +31,14 @@ def __init__(self, name: str) -> None:
         if not self.path.exists():
             raise QueueDoesNotExistError(str(self.path))
 
-        self.items = self.__getItems()
+        self.items = self.get_items()
 
         self.jsonData = {
             "name": self.name,
             "length": len(self)
         }
 
-    def __getItems(self) -> list:
+    def get_items(self) -> list:
         """Returns a list of items for this Queue
 
         Returns:

From 3846d2dda4e9c395cd5af170d17270e180539997 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 17 Jun 2021 12:09:46 -0400
Subject: [PATCH 49/75] Refactor to snake case

---
 src/webqueue2api/parser/queue.py | 38 ++++++++++++++++----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/webqueue2api/parser/queue.py b/src/webqueue2api/parser/queue.py
index e128932..d9df107 100644
--- a/src/webqueue2api/parser/queue.py
+++ b/src/webqueue2api/parser/queue.py
@@ -51,7 +51,7 @@ def get_items(self) -> list:
 
             isFile = True if os.path.isfile(item_path) else False
 
-            if isFile and isValidItemName(item):
+            if isFile and is_valid_item_name(item):
                 items.append(Item(self.name, item))
 
         return items
@@ -83,12 +83,12 @@ def __repr__(self) -> str:
 #------------------------------------------------------------------------------#
 # Utilities
 #------------------------------------------------------------------------------#
-def isValidItemName(name: str) -> bool:
+def is_valid_item_name(name: str) -> bool:
     """Returns true if file name is a valid item name
 
     Example:
-            isValidItemName("21") -> true
-            isValidItemName("twentyone") -> false
+            is_valid_item_name("21") -> true
+            is_valid_item_name("twentyone") -> false
 
     Args:
             name (str): The name to test.
@@ -99,7 +99,7 @@ def isValidItemName(name: str) -> bool:
     itemPattern = re.compile("^[0123456789]{1,3}$")
     return True if itemPattern.match(name) else False
 
-def getValidQueues() -> list:
+def get_valid_queues() -> list:
     """Returns a list of queues on the filesystem excluding ignored queues.
 
     Example:
@@ -111,16 +111,16 @@ def getValidQueues() -> list:
     queues = []
 
     for file in os.listdir(config.queue_directory):
-        currentFile = config.queue_directory + "/" + file
-        isDirectory = os.path.isdir(currentFile)
-        isValid = file not in config.queues_to_ignore
+        current_file = config.queue_directory + "/" + file
+        is_directory = os.path.isdir(current_file)
+        is_valid = file not in config.queues_to_ignore
 
-        if isDirectory and isValid:
+        if is_directory and is_valid:
             queues.append(file)
 
     return queues
 
-def getQueueCounts() -> list:
+def get_queue_counts() -> list:
     """Returns a list of dictionaries with the number of items in each queue.
 
     Example:
@@ -138,18 +138,18 @@ def getQueueCounts() -> list:
     Returns:
             list: Dictionaries with the number of items in each queue.
     """
-    queueInfo = []
-    for queue in getValidQueues():
-        possibleItems = os.listdir(config.queue_directory + "/" + queue)
-        validItems = [isValidItemName for file in possibleItems]
-        queueInfo.append( {"name": queue, "number_of_items": len(validItems)} )
+    queue_info = []
+    for queue in get_valid_queues():
+        possible_items = os.listdir(config.queue_directory + "/" + queue)
+        valid_items = [is_valid_item_name for file in possible_items]
+        queue_info.append( {"name": queue, "number_of_items": len(valid_items)} )
     
     # Sorts list of queue info alphabetically
-    sortedQueueInfo = sorted(queueInfo, key = lambda queueInfoList: queueInfoList['name'])
+    sorted_queue_info = sorted(queue_info, key = lambda queue_info_list: queue_info_list['name'])
 
-    return sortedQueueInfo
+    return sorted_queue_info
 
-def loadQueues() -> list:
+def load_queues() -> list:
     """Return a list of Queues for each queue.
 
     Returns:
@@ -157,7 +157,7 @@ def loadQueues() -> list:
     """
     queues = []
 
-    for queue in getValidQueues():
+    for queue in get_valid_queues():
         queues.append(Queue(queue))
 
     return queues
\ No newline at end of file

From daf5b983374382a228ef7f1e3e145fc80cc50725 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 17 Jun 2021 12:10:09 -0400
Subject: [PATCH 50/75] Update imports from parser.Queue

---
 src/webqueue2api/__init__.py        | 2 +-
 src/webqueue2api/parser/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/webqueue2api/__init__.py b/src/webqueue2api/__init__.py
index 77e2891..ba7b477 100644
--- a/src/webqueue2api/__init__.py
+++ b/src/webqueue2api/__init__.py
@@ -1,2 +1,2 @@
-from webqueue2api.parser import Item, Queue, loadQueues
+from webqueue2api.parser import Item, Queue, load_queues
 from .config import config
\ No newline at end of file
diff --git a/src/webqueue2api/parser/__init__.py b/src/webqueue2api/parser/__init__.py
index 4b4f038..403e741 100644
--- a/src/webqueue2api/parser/__init__.py
+++ b/src/webqueue2api/parser/__init__.py
@@ -3,7 +3,7 @@
 from .queue import Queue
 
 # Utilities
-from .queue import loadQueues
+from .queue import load_queues
 
 # Configuration
 from .config import config
\ No newline at end of file

From 1469b01fc984c6ac24b2bb896f5cc261b3801161 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 17 Jun 2021 12:24:37 -0400
Subject: [PATCH 51/75] Create Queue resource with error handling

---
 src/webqueue2api/api/resources/queue.py | 31 +++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 src/webqueue2api/api/resources/queue.py

diff --git a/src/webqueue2api/api/resources/queue.py b/src/webqueue2api/api/resources/queue.py
new file mode 100644
index 0000000..e900e0e
--- /dev/null
+++ b/src/webqueue2api/api/resources/queue.py
@@ -0,0 +1,31 @@
+from flask_restful import Resource
+from flask_jwt_extended import jwt_required
+# To avoid naming conflicts
+from webqueue2api.parser import Queue as _Queue
+from webqueue2api.parser.errors import QueueDoesNotExistError
+
+
+
+class Queue(Resource):
+    # @jwt_required
+    def get(self, queues: str) -> tuple:
+        """Returns the JSON representation of the queue requested.
+
+        Return Codes:
+                200 (OK): On success.
+
+        Args:
+            queues (str): Plus (+) deliminited list of queues.
+
+        Returns:
+            tuple: Queues as JSON and HTTP response code.
+        """
+        queues_requested = queues.split("+")
+
+        try:
+            queue_list = []
+            for queue in queues_requested:
+                queue_list.append(_Queue(queue).toJson())
+            return (queue_list, 200)
+        except QueueDoesNotExistError:
+            return ({"message": f"Queue {queue} not found."}, 404)
\ No newline at end of file

From 7a1c7b8d0f42c741ece01de8c3e1d17252142470 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 17 Jun 2021 12:24:49 -0400
Subject: [PATCH 52/75] Export Queue from resources

---
 src/webqueue2api/api/resources/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/webqueue2api/api/resources/__init__.py b/src/webqueue2api/api/resources/__init__.py
index 7e848b0..54395d3 100644
--- a/src/webqueue2api/api/resources/__init__.py
+++ b/src/webqueue2api/api/resources/__init__.py
@@ -1,3 +1,4 @@
 from .login import Login
 from .refresh_access_token import RefreshAccessToken
-from .item import Item
\ No newline at end of file
+from .item import Item
+from .queue import Queue
\ No newline at end of file

From 20bdc009089d2b96fa07a674e6f5f7e871ea18f1 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 17 Jun 2021 12:25:05 -0400
Subject: [PATCH 53/75] Add Queue resource to /api/data/queue path

---
 src/webqueue2api/api/app.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/webqueue2api/api/app.py b/src/webqueue2api/api/app.py
index 486ad81..2a2a42d 100644
--- a/src/webqueue2api/api/app.py
+++ b/src/webqueue2api/api/app.py
@@ -2,7 +2,7 @@
 from flask_restful import Api
 from flask_jwt_extended import JWTManager
 from .config import config
-from .resources import Login, RefreshAccessToken, Item
+from .resources import Login, RefreshAccessToken, Item, Queue
 
 app = Flask(__name__)
 api = Api(app)
@@ -32,4 +32,5 @@
 
 api.add_resource(Login, "/api/login")
 api.add_resource(RefreshAccessToken, "/api/tokens/refresh")
-api.add_resource(Item, "/api/data/<string:queue>/<int:number>")
\ No newline at end of file
+api.add_resource(Item, "/api/data/<string:queue>/<int:number>")
+api.add_resource(Queue, "/api/data/<string:queues>")
\ No newline at end of file

From b8a53e100298b3aefa5550355e3c9aa812d10807 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 17 Jun 2021 12:29:38 -0400
Subject: [PATCH 54/75] Update docstring and rename jsonData/toJson to
 json_data/to_json

---
 src/webqueue2api/parser/queue.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/webqueue2api/parser/queue.py b/src/webqueue2api/parser/queue.py
index d9df107..cef366f 100644
--- a/src/webqueue2api/parser/queue.py
+++ b/src/webqueue2api/parser/queue.py
@@ -17,9 +17,10 @@ class Queue:
             >>> queue = Queue("ce")
 
     Attributes:
-            name: The name of the queue.
-            items: A list of Items in the queue.
-            jsonData: A JSON serializable representation of the Queue.
+            name (str): The name of the queue.
+            path: (pathlib.Path): The path of the queue directory.
+            items (list): A list of Items in the queue.
+            json_data (dict): A JSON serializable representation of the Queue.
 
     Raises:
             QueueDoesNotExistError: If a queue's directory does not exist on the filesystem.
@@ -33,9 +34,8 @@ def __init__(self, name: str) -> None:
 
         self.items = self.get_items()
 
-        self.jsonData = {
+        self.json_data = {
             "name": self.name,
-            "length": len(self)
         }
 
     def get_items(self) -> list:
@@ -56,7 +56,7 @@ def get_items(self) -> list:
 
         return items
 
-    def toJson(self) -> dict:
+    def to_json(self) -> dict:
         """Return JSON safe representation of the Queue
 
         The JSON representation of every item in the Queue is added to the
@@ -68,9 +68,9 @@ def toJson(self) -> dict:
         items = []
         for item in self.items:
             items.append(item.toJson())
-        self.jsonData["items"] = items
+        self.json_data["items"] = items
 
-        return self.jsonData
+        return self.json_data
 
     def __len__(self) -> int:
         return len(self.items)

From 1d878b372c9b150adf44787c6b7a68fc17fdae03 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 17 Jun 2021 12:29:52 -0400
Subject: [PATCH 55/75] Update Queue.to_json reference

---
 src/webqueue2api/api/resources/queue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webqueue2api/api/resources/queue.py b/src/webqueue2api/api/resources/queue.py
index e900e0e..385caba 100644
--- a/src/webqueue2api/api/resources/queue.py
+++ b/src/webqueue2api/api/resources/queue.py
@@ -25,7 +25,7 @@ def get(self, queues: str) -> tuple:
         try:
             queue_list = []
             for queue in queues_requested:
-                queue_list.append(_Queue(queue).toJson())
+                queue_list.append(_Queue(queue).to_json())
             return (queue_list, 200)
         except QueueDoesNotExistError:
             return ({"message": f"Queue {queue} not found."}, 404)
\ No newline at end of file

From 6dcab81bacd437764d082cf6f36a0c511e27204e Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Thu, 17 Jun 2021 13:32:14 -0400
Subject: [PATCH 56/75] Refactor params to snake_case and update docstring

---
 src/webqueue2api/parser/item.py | 86 +++++++++++++++++----------------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/src/webqueue2api/parser/item.py b/src/webqueue2api/parser/item.py
index d4c599f..ed9b387 100644
--- a/src/webqueue2api/parser/item.py
+++ b/src/webqueue2api/parser/item.py
@@ -20,23 +20,26 @@ class Item:
 
     Example:
             # Create an Item (ce100)
-            >>> item = Item("ce", 100)
+            `item = Item("ce", 100)`
 
     Attributes:
-            lastUpdated: An ISO 8601 formatted time string showing the last time the file was updated according to the filesystem.
+            queue: The name of the queue the Item is in.
+            number: The number of the Item.
+            path: The path to the Item on the filesystem.
+            last_updated: An ISO 8601 formatted time string showing the last time the file was updated according to the filesystem.
             headers: A list of dictionaries containing header keys and values.
             content: A list of section dictionaries.
-            isLocked: A boolean showing whether or not a lockfile for the item is present.
-            userEmail: The email address of the person who this item is from.
-            userName: The real name of the person who this item is from.
-            userAlias: The Purdue career account alias of the person this item is from.
-            assignedTo: The Purdue career account alias of the person this item is assigned to
+            is_locked: A boolean showing whether or not a lockfile for the item is present.
+            user_email: The email address of the person who this item is from.
+            user_name: The real name of the person who this item is from.
+            user_alias: The Purdue career account alias of the person this item is from.
+            assigned_to: The Purdue career account alias of the person this item is assigned to
             subject: The subject of the original message for this item.
             status: The most recent status update for the item.
             priority: The most recent priority for this item.
             department: The most recent department for this item.
-            dateReceived: The date this item was created.
-            jsonData: A JSON serializable representation of the Item.
+            date_received: The date this item was created.
+            json_data: A JSON serializable representation of the Item.
 
     Raises:
             ItemDoesNotExistError: If an item does not exist on the filesystem.
@@ -50,45 +53,44 @@ def __init__(self, queue: str, number: int) -> None:
         except ValueError:
             raise ValueError(f"Could not convert {number} to an integer")
 
-        self.__path = Path(config.queue_directory, self.queue, str(self.number))
-        if not self.__path.exists():
-            raise ItemDoesNotExistError(str(self.__path))
+        self.path = Path(config.queue_directory, self.queue, str(self.number))
+        if not self.path.exists():
+            raise ItemDoesNotExistError(str(self.path))
 
-        self.lastUpdated = self.__getLastUpdated()
-        self.__rawItem = self.__getRawItem()
+        self.last_updated = self.__getLastUpdated()
+        self.__raw_tem = self.__getRawItem()
         self.headers = self.__parseHeaders()
         self.content = self.__parseSections()
-        self.isLocked = self.__isLocked()
-        self.userEmail = self.__parseFromData(data="userEmail")
-        self.userName = self.__parseFromData(data="userName")
-        self.userAlias = self.__getUserAlias()
-        self.assignedTo = self.__getMostRecentHeaderByType("Assigned-To")
+        self.is_locked = self.__isLocked()
+        self.user_email = self.__parseFromData(data="userEmail")
+        self.user_name = self.__parseFromData(data="userName")
+        self.user_alias = self.__getUserAlias()
+        self.assigned_to = self.__getMostRecentHeaderByType("Assigned-To")
         self.subject = self.__getMostRecentHeaderByType("Subject")
         self.status = self.__getMostRecentHeaderByType("Status")
         self.priority = self.__getMostRecentHeaderByType("Priority")
         self.department = self.__getMostRecentHeaderByType("Department")
         self.building = self.__getMostRecentHeaderByType("Building")
-        self.dateReceived = self.__getFormattedDate(
-        self.__getMostRecentHeaderByType("Date"))
+        self.date_received = self.__getFormattedDate(self.__getMostRecentHeaderByType("Date"))
 
         # TODO: Autopopulate jsonData w/ __dir__() command. Exclude `^_` and `jsonData`.
         self.jsonData = {
             "queue": self.queue,
             "number": self.number,
-            "lastUpdated": self.lastUpdated,
+            "lastUpdated": self.last_updated,
             "headers": self.headers,
             "content": self.content,
-            "isLocked": self.isLocked,
-            "userEmail": self.userEmail,
-            "userName": self.userName,
-            "userAlias": self.userAlias,
-            "assignedTo": self.assignedTo,
+            "isLocked": self.is_locked,
+            "userEmail": self.user_email,
+            "userName": self.user_name,
+            "userAlias": self.user_alias,
+            "assignedTo": self.assigned_to,
             "subject": self.subject,
             "status": self.status,
             "priority": self.priority,
             "department": self.department,
             "building": self.building,
-            "dateReceived": self.dateReceived
+            "dateReceived": self.date_received
         }
 
     def __getLastUpdated(self) -> str:
@@ -101,7 +103,7 @@ def __getLastUpdated(self) -> str:
                 str: last modified time of item reported by the filesystem in mm-dd-yy hh:mm am/pm format.
         """
         # TODO: Simplify this code block by allowing __getFormattedDate to accept milliseconds since the epoch.
-        unixTime = os.path.getmtime(self.__path)
+        unixTime = os.path.getmtime(self.path)
         formattedTime = time.strftime(
             '%m-%d-%y %I:%M %p', time.localtime(unixTime))
         return self.__getFormattedDate(formattedTime)
@@ -112,7 +114,7 @@ def __getRawItem(self) -> list:
         Returns:
                 list: List of all the lines in the item file
         """
-        with open(self.__path, errors="replace") as file:
+        with open(self.path, errors="replace") as file:
             return file.readlines()
 
     def __getHeaderBoundary(self) -> int:
@@ -126,7 +128,7 @@ def __getHeaderBoundary(self) -> int:
         Returns:
                 int: line number where the Item headers end
         """
-        for lineNumber, line in enumerate(self.__rawItem):
+        for lineNumber, line in enumerate(self.__raw_tem):
             if line == "\n":
                 return lineNumber
 
@@ -153,7 +155,7 @@ def __parseHeaders(self) -> list:
         # 	QTime-Updated-By: campb303
         queuePrefixPattern = re.compile(r"\[.*?\] {1}")
         for lineNumber in range(self.__getHeaderBoundary()):
-            line = self.__rawItem[lineNumber]
+            line = self.__raw_tem[lineNumber]
             lineHasQueuePrefix = queuePrefixPattern.match(line)
 
             if lineHasQueuePrefix:
@@ -193,7 +195,7 @@ def __parseSections(self) -> list:
         sections = []
 
         contentStart = self.__getHeaderBoundary() + 1
-        contentEnd = len(self.__rawItem) - 1
+        contentEnd = len(self.__raw_tem) - 1
 
         # List of assignments for the item
         assignementLsit = self.__assignmentParsing(contentStart)
@@ -209,7 +211,7 @@ def __parseSections(self) -> list:
             return sections
 
         # Checks for Directory Identifiers
-        if self.__rawItem[contentStart] == "\n" and self.__rawItem[contentStart + 1].startswith("\t"):
+        if self.__raw_tem[contentStart] == "\n" and self.__raw_tem[contentStart + 1].startswith("\t"):
 
             directoryStartLine = contentStart + 1
 
@@ -240,7 +242,7 @@ def __parseSections(self) -> list:
         # and the line number of any delimiters as well as the type
         for lineNumber in range(contentStart, contentEnd + 1):
 
-            line = self.__rawItem[lineNumber]
+            line = self.__raw_tem[lineNumber]
 
             # Looks for a starting delimiter and explicity excludes the reply-from-user ending delimiter
             if (line.startswith("*** Edited by: ") or
@@ -283,10 +285,10 @@ def __parseSections(self) -> list:
         for boundary in sectionBoundaries:
 
             # Sets line to the first line of the boundary (which is always the delimiter)
-            line = self.__rawItem[boundary["start"]]
+            line = self.__raw_tem[boundary["start"]]
 
             # Returns all of the lines within the current section
-            sectionContent = self.__rawItem[boundary["start"]: boundary["end"]]
+            sectionContent = self.__raw_tem[boundary["start"]: boundary["end"]]
 
             # Appends an initial message dictionary to sections
             if boundary["type"] == "initial_message":
@@ -392,7 +394,7 @@ def __directoryParsing(self, directoryStartLine: int) -> dict:
         while True:
 
             # Returns the line number at directory start line
-            info = self.__rawItem[directoryStartLine]
+            info = self.__raw_tem[directoryStartLine]
 
             # Breaks the loop if it encountrs a newline, signifying the end of the directory information
             if info == "\n":
@@ -491,7 +493,7 @@ def __assignmentParsing(self, contentStart: int) -> list:
         # Parses the header looking for assignment delimeters and stores info into their respective variables
         for headerContent in range(0, contentStart):
 
-            line = self.__rawItem[headerContent]
+            line = self.__raw_tem[headerContent]
 
             # Gets who the Item was assigned to
             if line.startswith("Assigned-To: "):
@@ -1003,7 +1005,7 @@ def __errorParsing(self, line: str, lineNum: int, expectedSyntax: str) -> dict:
             str(datetime.datetime.now()))
 
         # Item filepath
-        errorDictionary["file_path"] = str(self.__path)
+        errorDictionary["file_path"] = str(self.path)
 
         # Expected value
         errorDictionary["expected"] = expectedSyntax
@@ -1068,7 +1070,7 @@ def __isLocked(self) -> Union[str, bool]:
         Returns:
                 Union[str, bool]: String with info about lock if true, bool False if false
         """
-        lockFile = str(self.__path) + ".lck"
+        lockFile = str(self.path) + ".lck"
         if os.path.exists(lockFile):
             with open(lockFile) as file:
                 lockInfo = file.readline().split(" ")
@@ -1142,7 +1144,7 @@ def __getUserAlias(self) -> str:
 
         
         try:
-            emailUser, emailDomain = self.userEmail.split("@")
+            emailUser, emailDomain = self.user_email.split("@")
 
         # Returns an error parse if the self.useremail doesn't contain exactally one "@" symbol
         except ValueError:

From 840931c6a3241d252fbaf5a6bcce64876fc56875 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 09:54:33 -0400
Subject: [PATCH 57/75] Refactor Item module to snake case

---
 src/webqueue2api/api/resources/item.py |   2 +-
 src/webqueue2api/parser/item.py        | 191 ++++++++++++-------------
 2 files changed, 91 insertions(+), 102 deletions(-)

diff --git a/src/webqueue2api/api/resources/item.py b/src/webqueue2api/api/resources/item.py
index 85fc9e0..c1380f1 100644
--- a/src/webqueue2api/api/resources/item.py
+++ b/src/webqueue2api/api/resources/item.py
@@ -39,6 +39,6 @@ def get(self, queue: str, number: int) -> tuple:
             tuple: Item as JSON and HTTP response code.
         """
         try:
-            return (_Item(queue, number).toJson(), 200)
+            return (_Item(queue, number).to_json(), 200)
         except ItemDoesNotExistError:
             return ({"message": f"Item {queue}{number} not found."}, 404)
\ No newline at end of file
diff --git a/src/webqueue2api/parser/item.py b/src/webqueue2api/parser/item.py
index ed9b387..592fe6f 100644
--- a/src/webqueue2api/parser/item.py
+++ b/src/webqueue2api/parser/item.py
@@ -57,24 +57,24 @@ def __init__(self, queue: str, number: int) -> None:
         if not self.path.exists():
             raise ItemDoesNotExistError(str(self.path))
 
-        self.last_updated = self.__getLastUpdated()
-        self.__raw_tem = self.__getRawItem()
-        self.headers = self.__parseHeaders()
+        self.last_updated = self.__get_time_last_updated()
+        self.__raw_tem = self.__get_raw_item()
+        self.headers = self.__parse_eaders()
         self.content = self.__parseSections()
-        self.is_locked = self.__isLocked()
-        self.user_email = self.__parseFromData(data="userEmail")
-        self.user_name = self.__parseFromData(data="userName")
-        self.user_alias = self.__getUserAlias()
-        self.assigned_to = self.__getMostRecentHeaderByType("Assigned-To")
-        self.subject = self.__getMostRecentHeaderByType("Subject")
-        self.status = self.__getMostRecentHeaderByType("Status")
-        self.priority = self.__getMostRecentHeaderByType("Priority")
-        self.department = self.__getMostRecentHeaderByType("Department")
-        self.building = self.__getMostRecentHeaderByType("Building")
-        self.date_received = self.__getFormattedDate(self.__getMostRecentHeaderByType("Date"))
+        self.is_locked = self.__check_is_locked()
+        self.user_email = self.__parse_from_data(data="user_email")
+        self.user_name = self.__parse_from_data(data="user_name")
+        self.user_alias = self.__get_user_alias()
+        self.assigned_to = self.__get_most_recent_header_by_type("Assigned-To")
+        self.subject = self.__get_most_recent_header_by_type("Subject")
+        self.status = self.__get_most_recent_header_by_type("Status")
+        self.priority = self.__get_most_recent_header_by_type("Priority")
+        self.department = self.__get_most_recent_header_by_type("Department")
+        self.building = self.__get_most_recent_header_by_type("Building")
+        self.date_received = self.__get_formatted_date(self.__get_most_recent_header_by_type("Date"))
 
         # TODO: Autopopulate jsonData w/ __dir__() command. Exclude `^_` and `jsonData`.
-        self.jsonData = {
+        self.json_data = {
             "queue": self.queue,
             "number": self.number,
             "lastUpdated": self.last_updated,
@@ -93,7 +93,7 @@ def __init__(self, queue: str, number: int) -> None:
             "dateReceived": self.date_received
         }
 
-    def __getLastUpdated(self) -> str:
+    def __get_time_last_updated(self) -> str:
         """Returns last modified time of item reported by the filesystem in mm-dd-yy hh:mm am/pm format.
 
         Example: 
@@ -102,13 +102,11 @@ def __getLastUpdated(self) -> str:
         Returns:
                 str: last modified time of item reported by the filesystem in mm-dd-yy hh:mm am/pm format.
         """
-        # TODO: Simplify this code block by allowing __getFormattedDate to accept milliseconds since the epoch.
-        unixTime = os.path.getmtime(self.path)
-        formattedTime = time.strftime(
-            '%m-%d-%y %I:%M %p', time.localtime(unixTime))
-        return self.__getFormattedDate(formattedTime)
+        unix_time = os.path.getmtime(self.path)
+        formatted_time = time.strftime('%m-%d-%y %I:%M %p', time.localtime(unix_time))
+        return self.__get_formatted_date(formatted_time)
 
-    def __getRawItem(self) -> list:
+    def __get_raw_item(self) -> list:
         """Returns a list of all lines in the item file
 
         Returns:
@@ -117,7 +115,7 @@ def __getRawItem(self) -> list:
         with open(self.path, errors="replace") as file:
             return file.readlines()
 
-    def __getHeaderBoundary(self) -> int:
+    def __get_header_boundary(self) -> int:
         """Returns the 0 based line number where the Item headers stop.
 
         Example: The header end would be on line 13
@@ -128,11 +126,11 @@ def __getHeaderBoundary(self) -> int:
         Returns:
                 int: line number where the Item headers end
         """
-        for lineNumber, line in enumerate(self.__raw_tem):
+        for line_number, line in enumerate(self.__raw_tem):
             if line == "\n":
-                return lineNumber
+                return line_number
 
-    def __parseHeaders(self) -> list:
+    def __parse_eaders(self) -> list:
         """Returns a list containing dictionaries of header type and data.
         Removes queue prefixes and whitespace.
 
@@ -147,29 +145,27 @@ def __parseHeaders(self) -> list:
         Returns:
                 list: Header dicts
         """
-        headerString = ""
+        header_string = ""
 
         # Remove '[queue] ' prefixes:
         # Example:
         #	[ce] QTime-Updated-By: campb303 becomes
         # 	QTime-Updated-By: campb303
-        queuePrefixPattern = re.compile(r"\[.*?\] {1}")
-        for lineNumber in range(self.__getHeaderBoundary()):
-            line = self.__raw_tem[lineNumber]
-            lineHasQueuePrefix = queuePrefixPattern.match(line)
+        queue_prefix_pattern = re.compile(r"\[.*?\] {1}")
+        for line_number in range(self.__get_header_boundary()):
+            line = self.__raw_tem[line_number]
+            line_has_queue_prefix = queue_prefix_pattern.match(line)
 
-            if lineHasQueuePrefix:
-                queuePrefix = line[lineHasQueuePrefix.regs[0]
-                                   [0]: lineHasQueuePrefix.regs[0][1]]
-                line = line.replace(queuePrefix, "")
+            if line_has_queue_prefix:
+                queue_prefix = line[line_has_queue_prefix.regs[0][0]: line_has_queue_prefix.regs[0][1]]
+                line = line.replace(queue_prefix, "")
 
-            headerString += line
+            header_string += line
 
-        # message = email.message_from_string(headerString + "".join(self.__getContent()))
-        message = email.message_from_string(headerString)
+        message = email.message_from_string(header_string)
 
         headers = []
-        dateHeaders=[
+        date_headers=[
             "QStatus-Updated-Time",
             "Status-Updated-Time",
             "Edited-Time",
@@ -184,17 +180,15 @@ def __parseHeaders(self) -> list:
         ]
 
         for key in message.keys():
-            headers.append({"type": key, "content": self.__getFormattedDate(message[key]) if key in dateHeaders else message[key]})
+            headers.append({"type": key, "content": self.__get_formatted_date(message[key]) if key in date_headers else message[key]})
 
         return headers
 
-    # TODO: Implement attachment parsing
-
     def __parseSections(self) -> list:
         # List of all item events
         sections = []
 
-        contentStart = self.__getHeaderBoundary() + 1
+        contentStart = self.__get_header_boundary() + 1
         contentEnd = len(self.__raw_tem) - 1
 
         # List of assignments for the item
@@ -507,7 +501,7 @@ def __assignmentParsing(self, contentStart: int) -> list:
                 dateFromLine = (
                     re.search("(?<=Assigned-To-Updated-Time: )(.*)", line)).group()
 
-                assignedDateTime = self.__getFormattedDate(dateFromLine)
+                assignedDateTime = self.__get_formatted_date(dateFromLine)
 
             # Gets who assigned the Item
             elif line.startswith("Assigned-To-Updated-By: "):
@@ -552,24 +546,24 @@ def __initialMessageParsing(self, content: list) -> dict:
         initialMessageDictionary["type"] = "initial_message"
 
         # Gets the initial message date from the header
-        rawMessageDateStr = self.__getMostRecentHeaderByType("Date")
+        rawMessageDateStr = self.__get_most_recent_header_by_type("Date")
 
         # Sets datetime in the intialMessage dictionary to UTC formatted date
-        initialMessageDictionary["datetime"] = self.__getFormattedDate(
+        initialMessageDictionary["datetime"] = self.__get_formatted_date(
             rawMessageDateStr)
 
-        initialMessageDictionary["from_name"] = self.__parseFromData(
-            data="userName")
+        initialMessageDictionary["from_name"] = self.__parse_from_data(
+            data="user_name")
 
-        initialMessageDictionary["from_email"] = self.__parseFromData(
-            data="userEmail")
+        initialMessageDictionary["from_email"] = self.__parse_from_data(
+            data="user_email")
 
         # Stores list of dictionaries for the recipients of the initial message
         initialMessageDictionary["to"] = []
 
         # Parses the header looking for recipients of the initial message and stores it in a list of tuples
         rawMessageRecipientsList = email.utils.getaddresses(
-            [self.__getMostRecentHeaderByType("To")])
+            [self.__get_most_recent_header_by_type("To")])
 
         # Parses the CC list and stores the cc recipient information in a list of dictionaries
         for recipients in rawMessageRecipientsList:
@@ -584,7 +578,7 @@ def __initialMessageParsing(self, content: list) -> dict:
 
         # Parses the header looking for CC recipients of the initial message and stores it in a list of tuples
         rawMessageCCList = email.utils.getaddresses(
-            [self.__getMostRecentHeaderByType("CC")])
+            [self.__get_most_recent_header_by_type("CC")])
 
         # Parses the CC list and stores the cc recipient information in a list of dictionaries
         for ccRecipients in rawMessageCCList:
@@ -594,7 +588,7 @@ def __initialMessageParsing(self, content: list) -> dict:
                  "email": ccRecipients[1]}
             )
 
-        initialMessageDictionary["subject"] = self.__getMostRecentHeaderByType(
+        initialMessageDictionary["subject"] = self.__get_most_recent_header_by_type(
             "Subject")
 
         # Removes unecessary newlines from the begining and the end of the initial message
@@ -655,7 +649,7 @@ def __editParsing(self, content: list, lineNum: int) -> dict:
             return self.__errorParsing(delimiterLine, lineNum, errorMessage)
 
         # Attempts to format the date and time into utc format
-        editInfo["datetime"] = self.__getFormattedDate(dateTimeString)
+        editInfo["datetime"] = self.__get_formatted_date(dateTimeString)
 
         # Remove the delimiter String and unecessary newlines
         editInfo["content"] = self.__getFormattedSectionContent(content)
@@ -713,7 +707,7 @@ def __replyToParsing(self, content: list, lineNum: int) -> dict:
             return self.__errorParsing(delimiterLine, lineNum, errorMessage)
 
         # Formats date to UTC
-        replyInfo["datetime"] = self.__getFormattedDate(dateTimeString)
+        replyInfo["datetime"] = self.__get_formatted_date(dateTimeString)
 
         replyInfo["content"] = self.__getFormattedSectionContent(content)
 
@@ -767,7 +761,7 @@ def __statusParsing(self, content: list, lineNum: int) -> dict:
             return self.__errorParsing(delimiterLine, lineNum, errorMessage)
 
         # Formats the date to UTC
-        statusInfo["datetime"] = self.__getFormattedDate(dateTimeString)
+        statusInfo["datetime"] = self.__get_formatted_date(dateTimeString)
 
         # Remove the delimiter String and unecessary newlines
         statusInfo["content"] = self.__getFormattedSectionContent(content)
@@ -896,7 +890,7 @@ def __userReplyParsing(self, replyContent: list, lineNumber: int) -> dict:
                     return self.__errorParsing(line, lineNumber + lineNum + 1, errorMessage)
 
                 # Formatts the date to UTC
-                replyFromInfo["datetime"] = self.__getFormattedDate(dateStr)
+                replyFromInfo["datetime"] = self.__get_formatted_date(dateStr)
 
             elif line.startswith("Cc: ") and newLineCounter == 1:
 
@@ -1001,7 +995,7 @@ def __errorParsing(self, line: str, lineNum: int, expectedSyntax: str) -> dict:
         errorDictionary["type"] = "parse_error"
 
         # Dateime of the parse error
-        errorDictionary["datetime"] = self.__getFormattedDate(
+        errorDictionary["datetime"] = self.__get_formatted_date(
             str(datetime.datetime.now()))
 
         # Item filepath
@@ -1058,7 +1052,7 @@ def __getSortedSections(self, sectionsList: list) -> list:
 
         return sortedSections
 
-    def __isLocked(self) -> Union[str, bool]:
+    def __check_is_locked(self) -> Union[str, bool]:
         """Returns a string info about the lock if true and a bool False if false
 
         Example: A file is locked
@@ -1070,93 +1064,88 @@ def __isLocked(self) -> Union[str, bool]:
         Returns:
                 Union[str, bool]: String with info about lock if true, bool False if false
         """
-        lockFile = str(self.path) + ".lck"
-        if os.path.exists(lockFile):
-            with open(lockFile) as file:
-                lockInfo = file.readline().split(" ")
-                lockedBy = lockInfo[4]
-                lockedUsing = lockInfo[1]
-                return "{queue} {number} is locked by {lockedBy} using {lockedUsing}".format(queue=self.queue, number=self.number, lockedBy=lockedBy, lockedUsing=lockedUsing)
+        lock_file = str(self.path) + ".lck"
+        if os.path.exists(lock_file):
+            with open(lock_file) as file:
+                lock_info = file.readline().split(" ")
+                locked_by = lock_info[4]
+                locked_using = lock_info[1]
+                return f"{self.queue} {self.number} is locked by {locked_by} using {locked_using}"
         else:
             return False
 
-    def __getMostRecentHeaderByType(self, headerType: str) -> str:
+    def __get_most_recent_header_by_type(self, header_type: str) -> str:
         """Return the data of most recent header of the given type. 
         If no header of that type exists, return an empty string.
 
         Example: Requesting a Status header that does exist
-                __getMostRecentHeaderByType("Status")
+                __get_most_recent_header_by_type("Status")
                 becomes  "Waiting for Reply"
 
         Example: Requesting a Status header that doesn't exist
-                __getMostRecentHeaderByType("Status")
+                __get_most_recent_header_by_type("Status")
                 becomes ""
 
         Args:
-                headerType (str): Type of header to return.
+                header_type (str): Type of header to return.
 
         Returns:
                 str: data of most recent header of the given type or empty string.
         """
         for header in self.headers:
-            if header["type"] == headerType:
+            if header["type"] == header_type:
                 return header["content"]
         return ""
 
-    def __parseFromData(self, data: str) -> str:
+    def __parse_from_data(self, data: str) -> str:
         """Parse From header and return requested data.
         Returns empty string if requested data is unavailable.
 
         Examples: From data is "From: Campbell, Justin <campb303@purdue.edu>"
-                __parseFromData(data="userName") returns "Campbell, Justin"
-                __parseFromData(data="userEmail") returns "campb303@purdue.edu"
+                __parse_from_data(data="userName") returns "Campbell, Justin"
+                __parse_from_data(data="userEmail") returns "campb303@purdue.edu"
 
         Args:
-                data (str): The data desired; can be "userName" or "userEmail".
+                data (str): The data desired; can be "user_name" or "user_email".
 
         Returns:
                 str: userName, userEmail or empty string.
         """
-        fromHeader = self.__getMostRecentHeaderByType("From")
-        userName, userEmail = email.utils.parseaddr(fromHeader)
+        from_header = self.__get_most_recent_header_by_type("From")
+        user_name, user_email = email.utils.parseaddr(from_header)
 
-        if data == "userName":
-            return userName
-        elif data == "userEmail":
-            return userEmail
+        if data == "user_name":
+            return user_name
+        elif data == "user_email":
+            return user_email
         else:
             raise ValueError(
-                "data='" + str(data) + "' is not a valid option. data must be \"userName\" or \"userEmail\".")
+                "data='" + str(data) + "' is not a valid option. data must be \"user_name\" or \"user_email\".")
 
-    def __getUserAlias(self) -> str:
+    def __get_user_alias(self) -> str:
         """Returns user's Career Account alias if present.
         If Career Account alias isn't present, returns empty string.
 
         Example: Email from campb303@purdue.edu
-                userAlias = "campb303"
+                user_alias = "campb303"
 
         Example: Email from spam@spammer.net
-                userAlias = "" 
+                user_alias = "" 
 
         Returns:
                 str: User's Career Account alias if present or empty string
         """
-
-        
         try:
-            emailUser, emailDomain = self.user_email.split("@")
-
-        # Returns an error parse if the self.useremail doesn't contain exactally one "@" symbol
+            email_user, email_domain = self.user_email.split("@")
         except ValueError:
-            # Parses through the self.headers list to find the "From" header and its line number
-            for lineNum, header in enumerate(self.headers):
+            for line_num, header in enumerate(self.headers):
                 if header["type"] == "From":
-                    headerString = header["type"] + ": " + header["content"]
-                    return self.__errorParsing(headerString, lineNum + 1, "Expected valid email Address")
+                    header_string = header["type"] + ": " + header["content"]
+                    return self.__errorParsing(header_string, line_num + 1, "Expected valid email Address")
 
-        return emailUser if emailDomain.endswith("purdue.edu") else ""
+        return email_user if email_domain.endswith("purdue.edu") else ""
 
-    def __getFormattedDate(self, date: str) -> str:
+    def __get_formatted_date(self, date: str) -> str:
         """Returns the date/time formatted as RFC 8601 YYYY-MM-DDTHH:MM:SS+00:00.
         Returns empty string if the string argument passed to the function is not a datetime.
         See: https://en.wikipedia.org/wiki/ISO_8601
@@ -1166,22 +1155,22 @@ def __getFormattedDate(self, date: str) -> str:
         """
         try:
             # This date is never meant to be used. The default attribute is just to set timezone.
-            parsedDate = parse(date, default=datetime.datetime(
+            parsed_date = parse(date, default=datetime.datetime(
                 1970, 1, 1, tzinfo=tz.gettz('EDT')))
         except:
             return ""
 
-        parsedDateString = parsedDate.strftime("%Y-%m-%dT%H:%M:%S%z")
+        parsed_date_string = parsed_date.strftime("%Y-%m-%dT%H:%M:%S%z")
 
-        return parsedDateString
+        return parsed_date_string
 
-    def toJson(self) -> dict:
+    def to_json(self) -> dict:
         """Returns a JSON safe representation of the item.
 
         Returns:
                 dict: JSON safe representation of the item.
         """
-        return self.jsonData
+        return self.json_data
 
     def __repr__(self) -> str:
         return self.queue + str(self.number)
\ No newline at end of file

From e85592bc16e085c21a38f60c7bb99c91a62816e8 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 09:58:16 -0400
Subject: [PATCH 58/75] Refactored to snake case

---
 src/webqueue2api/parser/queue.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/webqueue2api/parser/queue.py b/src/webqueue2api/parser/queue.py
index cef366f..4c4586f 100644
--- a/src/webqueue2api/parser/queue.py
+++ b/src/webqueue2api/parser/queue.py
@@ -49,9 +49,9 @@ def get_items(self) -> list:
         for item in os.listdir(self.path):
             item_path = Path(self.path, item)
 
-            isFile = True if os.path.isfile(item_path) else False
+            is_file = True if os.path.isfile(item_path) else False
 
-            if isFile and is_valid_item_name(item):
+            if is_file and is_valid_item_name(item):
                 items.append(Item(self.name, item))
 
         return items
@@ -96,8 +96,8 @@ def is_valid_item_name(name: str) -> bool:
     Returns:
             bool: Name is valid item name.
     """
-    itemPattern = re.compile("^[0123456789]{1,3}$")
-    return True if itemPattern.match(name) else False
+    item_pattern = re.compile("^[0123456789]{1,3}$")
+    return True if item_pattern.match(name) else False
 
 def get_valid_queues() -> list:
     """Returns a list of queues on the filesystem excluding ignored queues.

From c82240cb3bae761068d8e07ec0af8b06bf410e9c Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 10:04:06 -0400
Subject: [PATCH 59/75] Create QueueList resource

---
 src/webqueue2api/api/resources/queue_list.py | 29 ++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/webqueue2api/api/resources/queue_list.py

diff --git a/src/webqueue2api/api/resources/queue_list.py b/src/webqueue2api/api/resources/queue_list.py
new file mode 100644
index 0000000..8833f52
--- /dev/null
+++ b/src/webqueue2api/api/resources/queue_list.py
@@ -0,0 +1,29 @@
+from flask_restful import Resource
+from flask_jwt_extended import jwt_required
+from webqueue2api.parser import get_queue_counts
+
+
+class QueueList(Resource):
+    # @jwt_required
+    def get(self) -> tuple:
+        """Returns a list of dictionaries with the number of items in each queue.
+
+        Return Codes:
+                200 (OK): On success.
+
+        Example:
+                [
+                    {
+                        name: "me",
+                        number_of_items: 42
+                    },
+                    {
+                        name: "bidc",
+                        number_of_items: 3
+                    }
+                ]
+
+        Returns:
+                tuple: Queues and item counts as JSON and HTTP response code.
+        """
+        return (get_queue_counts(), 200)
\ No newline at end of file

From 30be28165b56be8cfaf313346584030cd957e52d Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 10:04:22 -0400
Subject: [PATCH 60/75] Export QueueList resource

---
 src/webqueue2api/api/resources/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/webqueue2api/api/resources/__init__.py b/src/webqueue2api/api/resources/__init__.py
index 54395d3..c8d303a 100644
--- a/src/webqueue2api/api/resources/__init__.py
+++ b/src/webqueue2api/api/resources/__init__.py
@@ -1,4 +1,5 @@
 from .login import Login
 from .refresh_access_token import RefreshAccessToken
 from .item import Item
-from .queue import Queue
\ No newline at end of file
+from .queue import Queue
+from .queue_list import QueueList
\ No newline at end of file

From 74c7453a304bae2e837e07d5c86bdef70533aff4 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 10:04:41 -0400
Subject: [PATCH 61/75] Export get_queue_counts for QueueList resource

---
 src/webqueue2api/parser/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webqueue2api/parser/__init__.py b/src/webqueue2api/parser/__init__.py
index 403e741..3d312e7 100644
--- a/src/webqueue2api/parser/__init__.py
+++ b/src/webqueue2api/parser/__init__.py
@@ -3,7 +3,7 @@
 from .queue import Queue
 
 # Utilities
-from .queue import load_queues
+from .queue import load_queues, get_queue_counts
 
 # Configuration
 from .config import config
\ No newline at end of file

From 82ac80a8438008d801f2c26b7a903171ca40aaf3 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 10:04:53 -0400
Subject: [PATCH 62/75] Add QueueList resource to API

---
 src/webqueue2api/api/app.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/webqueue2api/api/app.py b/src/webqueue2api/api/app.py
index 2a2a42d..fdc00a9 100644
--- a/src/webqueue2api/api/app.py
+++ b/src/webqueue2api/api/app.py
@@ -2,7 +2,7 @@
 from flask_restful import Api
 from flask_jwt_extended import JWTManager
 from .config import config
-from .resources import Login, RefreshAccessToken, Item, Queue
+from .resources import Login, RefreshAccessToken, Item, Queue, QueueList
 
 app = Flask(__name__)
 api = Api(app)
@@ -33,4 +33,5 @@
 api.add_resource(Login, "/api/login")
 api.add_resource(RefreshAccessToken, "/api/tokens/refresh")
 api.add_resource(Item, "/api/data/<string:queue>/<int:number>")
-api.add_resource(Queue, "/api/data/<string:queues>")
\ No newline at end of file
+api.add_resource(Queue, "/api/data/<string:queues>")
+api.add_resource(QueueList, "/api/data/get_queues")
\ No newline at end of file

From 48a4d17463882a026fd8865ffb2ec984a3a4c9c4 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 10:05:45 -0400
Subject: [PATCH 63/75] Delete old modules

---
 ECNQueue.py | 1374 ---------------------------------------------------
 api.py      |  248 ----------
 2 files changed, 1622 deletions(-)
 delete mode 100644 ECNQueue.py
 delete mode 100644 api.py

diff --git a/ECNQueue.py b/ECNQueue.py
deleted file mode 100644
index 17d9c5a..0000000
--- a/ECNQueue.py
+++ /dev/null
@@ -1,1374 +0,0 @@
-"""A library for interacting with Purdue ECN's ticketing system.
-
-This library allows interacting with queue Items (called Items) and collections
-of items (called Queues).
-
-Example:
-    # Create a single Item (ce100)
-    >>> item = Item("ce", 100)
-    # Get the sender's email address from an Item
-    >>> item = Item("ce", 100)
-    >>> item.userEmail
-
-    # Create an entire Queue (ce)
-    >>> queue = Queue("ce")
-    # Get the number of items in a Queue
-    >>> queue = Queue("ce")
-    >>> numItems = len(queue)
-
-    # Get all queues (and their items)
-    >>> queues = getQueues()
-
-Attributes:
-    queueDirectory: The directory to load queues from.
-    queuesToIgnore: Queues that will not be loaded when running getQueues()
-
-Raises:
-    # TODO: Add description(s) of when a ValueError is raised.
-    ValueError: [description]
-"""
-
-#------------------------------------------------------------------------------#
-# Imports
-#------------------------------------------------------------------------------#
-import os
-import time
-import email
-import re
-import datetime
-from dateutil.parser import parse
-from dateutil import tz
-from typing import Union
-import json
-
-
-#------------------------------------------------------------------------------#
-# Configuration
-#------------------------------------------------------------------------------#
-
-# The directory where queue items are
-currentFilePath = __file__
-currentFileDirectory = os.path.dirname(currentFilePath)
-currentFileDirectoryParent = os.path.dirname(currentFileDirectory)
-queueDirectory = os.path.join(currentFileDirectoryParent, "q-snapshot")
-
-# Queues to not load in getQueues()
-queuesToIgnore = ["archives", "drafts", "inbox", "coral"]
-
-
-
-#------------------------------------------------------------------------------#
-# Utilities
-#------------------------------------------------------------------------------#
-
-def isValidItemName(name: str) -> bool:
-    """Returns true if file name is a valid item name
-
-    Example:
-            isValidItemName("21") -> true
-            isValidItemName("twentyone") -> false
-
-    Args:
-            name (str): The name to test.
-
-    Returns:
-            bool: Name is valid item name.
-    """
-    itemPattern = re.compile("^[0123456789]{1,3}$")
-    return True if itemPattern.match(name) else False
-
-
-
-#------------------------------------------------------------------------------#
-# Classes
-#------------------------------------------------------------------------------#
-class Item:
-    """A single issue.
-
-    Example:
-            # Create an Item (ce100)
-            >>> item = Item("ce", 100)
-
-    Attributes:
-            lastUpdated: An ISO 8601 formatted time string showing the last time the file was updated according to the filesystem.
-            headers: A list of dictionaries containing header keys and values.
-            content: A list of section dictionaries.
-            isLocked: A boolean showing whether or not a lockfile for the item is present.
-            userEmail: The email address of the person who this item is from.
-            userName: The real name of the person who this item is from.
-            userAlias: The Purdue career account alias of the person this item is from.
-            assignedTo: The Purdue career account alias of the person this item is assigned to
-            subject: The subject of the original message for this item.
-            status: The most recent status update for the item.
-            priority: The most recent priority for this item.
-            department: The most recent department for this item.
-            dateReceived: The date this item was created.
-            jsonData: A JSON serializable representation of the Item.
-    """
-
-    def __init__(self, queue: str, number: int) -> None:
-        self.queue = queue
-        try:
-            self.number = int(number)
-        except ValueError:
-            raise ValueError(" Could not convert \"" +
-                             number + "\" to an integer")
-
-        self.__path = "/".join([queueDirectory, self.queue, str(self.number)])
-        self.lastUpdated = self.__getLastUpdated()
-        self.__rawItem = self.__getRawItem()
-        self.headers = self.__parseHeaders()
-        self.content = self.__parseSections()
-        self.isLocked = self.__isLocked()
-        self.userEmail = self.__parseFromData(data="userEmail")
-        self.userName = self.__parseFromData(data="userName")
-        self.userAlias = self.__getUserAlias()
-        self.assignedTo = self.__getMostRecentHeaderByType("Assigned-To")
-        self.subject = self.__getMostRecentHeaderByType("Subject")
-        self.status = self.__getMostRecentHeaderByType("Status")
-        self.priority = self.__getMostRecentHeaderByType("Priority")
-        self.department = self.__getMostRecentHeaderByType("Department")
-        self.building = self.__getMostRecentHeaderByType("Building")
-        self.dateReceived = self.__getFormattedDate(
-            self.__getMostRecentHeaderByType("Date"))
-
-        # TODO: Autopopulate jsonData w/ __dir__() command. Exclude `^_` and `jsonData`.
-        self.jsonData = {
-            "queue": self.queue,
-            "number": self.number,
-            "lastUpdated": self.lastUpdated,
-            "headers": self.headers,
-            "content": self.content,
-            "isLocked": self.isLocked,
-            "userEmail": self.userEmail,
-            "userName": self.userName,
-            "userAlias": self.userAlias,
-            "assignedTo": self.assignedTo,
-            "subject": self.subject,
-            "status": self.status,
-            "priority": self.priority,
-            "department": self.department,
-            "building": self.building,
-            "dateReceived": self.dateReceived
-        }
-
-    def __getLastUpdated(self) -> str:
-        """Returns last modified time of item reported by the filesystem in mm-dd-yy hh:mm am/pm format.
-
-        Example: 
-                07-23-20 10:34 AM
-
-        Returns:
-                str: last modified time of item reported by the filesystem in mm-dd-yy hh:mm am/pm format.
-        """
-        # TODO: Simplify this code block by allowing __getFormattedDate to accept milliseconds since the epoch.
-        unixTime = os.path.getmtime(self.__path)
-        formattedTime = time.strftime(
-            '%m-%d-%y %I:%M %p', time.localtime(unixTime))
-        return self.__getFormattedDate(formattedTime)
-
-    def __getRawItem(self) -> list:
-        """Returns a list of all lines in the item file
-
-        Returns:
-                list: List of all the lines in the item file
-        """
-        with open(self.__path, errors="replace") as file:
-            return file.readlines()
-
-    def __getHeaderBoundary(self) -> int:
-        """Returns the 0 based line number where the Item headers stop.
-
-        Example: The header end would be on line 13
-                12: X-ECN-Queue-Original-URL:
-                13: 
-                14: I need help.
-
-        Returns:
-                int: line number where the Item headers end
-        """
-        for lineNumber, line in enumerate(self.__rawItem):
-            if line == "\n":
-                return lineNumber
-
-    def __parseHeaders(self) -> list:
-        """Returns a list containing dictionaries of header type and data.
-        Removes queue prefixes and whitespace.
-
-        Examples:
-                "[ce] QStatus: Dont Delete\\nFrom: Justin Campbell <campb303@purdue.edu>\\n"
-                becomes 
-                [ 
-                        {"QStatus": "Don't Delete"},
-                        {"From": "Justin Campbell <campb303@purdue.edu>"}
-                ]
-
-        Returns:
-                list: Header dicts
-        """
-        headerString = ""
-
-        # Remove '[queue] ' prefixes:
-        # Example:
-        #	[ce] QTime-Updated-By: campb303 becomes
-        # 	QTime-Updated-By: campb303
-        queuePrefixPattern = re.compile(r"\[.*?\] {1}")
-        for lineNumber in range(self.__getHeaderBoundary()):
-            line = self.__rawItem[lineNumber]
-            lineHasQueuePrefix = queuePrefixPattern.match(line)
-
-            if lineHasQueuePrefix:
-                queuePrefix = line[lineHasQueuePrefix.regs[0]
-                                   [0]: lineHasQueuePrefix.regs[0][1]]
-                line = line.replace(queuePrefix, "")
-
-            headerString += line
-
-        # message = email.message_from_string(headerString + "".join(self.__getContent()))
-        message = email.message_from_string(headerString)
-
-        headers = []
-        dateHeaders=[
-            "QStatus-Updated-Time",
-            "Status-Updated-Time",
-            "Edited-Time",
-            "QTime-Updated-Time",
-            "Merged-Time",
-            "Time-Updated-Time",
-            "Replied-Time",
-            "Assigned-To-Updated-Time",
-            "QAssigned-To-Updated-Time",
-            "Date",
-            "Sent"
-        ]
-
-        for key in message.keys():
-            headers.append({"type": key, "content": self.__getFormattedDate(message[key]) if key in dateHeaders else message[key]})
-
-        return headers
-
-    # TODO: Implement attachment parsing
-
-    def __parseSections(self) -> list:
-        # List of all item events
-        sections = []
-
-        contentStart = self.__getHeaderBoundary() + 1
-        contentEnd = len(self.__rawItem) - 1
-
-        # List of assignments for the item
-        assignementLsit = self.__assignmentParsing(contentStart)
-
-        # Appends each assignment individually to sections
-        for assignment in assignementLsit:
-            sections.append(assignment)
-
-        # Checks for empty content within an item and returns and
-        if contentEnd <= contentStart:
-            blankInitialMessage = self.__initialMessageParsing([""])
-            sections.append(blankInitialMessage)
-            return sections
-
-        # Checks for Directory Identifiers
-        if self.__rawItem[contentStart] == "\n" and self.__rawItem[contentStart + 1].startswith("\t"):
-
-            directoryStartLine = contentStart + 1
-
-            # Parses the directory information and returns a dictionary of directory values
-            directoryInfo = self.__directoryParsing(directoryStartLine)
-
-            # Appends Directory Information into the sections array
-            sections.append(directoryInfo)
-
-            # Sets the initial message start to the next line after all directory lines and newlines
-            contentStart = contentStart + len(directoryInfo) + 1
-
-        # The start line, type, and end line for item events
-        sectionBoundaries = []
-
-        # Delimiter info
-        delimiters = [
-            {"name": "edit", "pattern": "*** Edited"},
-            {"name": "status", "pattern": "*** Status"},
-            {"name": "replyToUser", "pattern": "*** Replied"},
-            {"name": "replyFromUser", "pattern": "=== "},
-        ]
-
-        # Signifies that there is an initial message to parse
-        initialMessageSection = True
-
-        # Parses the entire contents of the message, stores everything before any delimiter as the initial message
-        # and the line number of any delimiters as well as the type
-        for lineNumber in range(contentStart, contentEnd + 1):
-
-            line = self.__rawItem[lineNumber]
-
-            # Looks for a starting delimiter and explicity excludes the reply-from-user ending delimiter
-            if (line.startswith("*** Edited by: ") or
-                    line.startswith("*** Replied by: ") or
-                    line.startswith("*** Status updated by: ") or
-                    line == "=== Additional information supplied by user ===\n" and not
-                    line == "===============================================\n"
-                    ):
-
-                # Sets the delimiter type based on the pattern within the delimiters list
-                for delimiter in delimiters:
-
-                    if line.startswith(delimiter["pattern"]):
-                        sectionBoundaries.append(
-                            {"start": lineNumber, "type": delimiter["name"]})
-                        break
-
-                # If a starting delimiter was encountered, then there is no initial message
-                if initialMessageSection:
-                    initialMessageSection = False
-
-            elif initialMessageSection == True:
-                # Delimiter not encountered yet, so append initial message starting line as the current lin number
-                sectionBoundaries.append(
-                    {"start": lineNumber, "type": "initial_message"})
-                initialMessageSection = False
-
-        # Used to set the end line of the last delimiter
-        sectionBoundaries.append({"start": contentEnd + 1})
-
-        # Sets the end of the section boundary to the begining of the next section boundary
-        for boundaryIndex in range(0, len(sectionBoundaries) - 1):
-
-            sectionBoundaries[boundaryIndex]["end"] = sectionBoundaries[boundaryIndex + 1]["start"]
-
-        # Remove End of File boundary since the line number has been assigned to the last delimiter
-        del sectionBoundaries[-1]
-
-        # Parses through all the boundaries in section boundaries
-        for boundary in sectionBoundaries:
-
-            # Sets line to the first line of the boundary (which is always the delimiter)
-            line = self.__rawItem[boundary["start"]]
-
-            # Returns all of the lines within the current section
-            sectionContent = self.__rawItem[boundary["start"]: boundary["end"]]
-
-            # Appends an initial message dictionary to sections
-            if boundary["type"] == "initial_message":
-                initialMessageDictionary = self.__initialMessageParsing(
-                    sectionContent)
-                sections.append(initialMessageDictionary)
-
-            elif boundary["type"] == "edit":
-                # Returns a dictionary with edit information
-                editInfo = self.__editParsing(
-                    sectionContent, boundary["start"])
-
-                # Checks for a parse error and appends it, returning the sections list which stops the parsing
-                if editInfo["type"] == "parse_error":
-                    sections.append(editInfo)
-                    return self.__getSortedSections(sections)
-
-                # Appends the edit dictionary to sections
-                sections.append(editInfo)
-
-            elif boundary["type"] == "replyToUser":
-                # Returns a dictionary with reply-to information
-                replyToInfo = self.__replyToParsing(
-                    sectionContent, boundary["start"])
-
-                # Checks for a parse error and appends it, returning the sections list which stops the parsing
-                if replyToInfo["type"] == "parse_error":
-                    sections.append(replyToInfo)
-                    return self.__getSortedSections(sections)
-
-                # Appends the reply-to to sections
-                sections.append(replyToInfo)
-
-            elif boundary["type"] == "status":
-                # Returns a dictionary with status information
-                statusInfo = self.__statusParsing(
-                    sectionContent, boundary["start"])
-
-                if statusInfo["type"] == "parse_error":
-                    sections.append(statusInfo)
-                    return self.__getSortedSections(sections)
-
-                # Appends the status to sections
-                sections.append(statusInfo)
-
-            elif boundary["type"] == "replyFromUser":
-                # Returns a dictionary with userReply information
-                replyFromInfo = self.__userReplyParsing(
-                    sectionContent, boundary["start"])
-
-                if replyFromInfo["type"] == "parse_error":
-                    sections.append(replyFromInfo)
-                    return self.__getSortedSections(sections)
-
-                # Appends the replyFrom to sections
-                sections.append(replyFromInfo)
-
-        sortedSections = self.__getSortedSections(sections)
-
-        return sortedSections
-        # return sections
-
-    def __directoryParsing(self, directoryStartLine: int) -> dict:
-        """Returns a dictionary with directory information
-
-        Example:
-                Name: Nestor Fabian Rodriguez Buitrago
-                Login: rodri563
-                Computer: ce-205-38 (128.46.205.67)
-                Location: HAMP G230
-                Email: rodri563@purdue.edu
-                Phone: 7654766893
-                Office: HAMP G230
-                UNIX Dir: /home/bridge/b/rodri563
-                Zero Dir: U=\\bridge.ecn.purdue.edu\rodri563
-                User ECNDB: http://eng.purdue.edu/jump/2e8399a
-                Host ECNDB: http://eng.purdue.edu/jump/2e83999    
-                Subject: Autocad installation
-
-        Args:
-                directoryStartLine (int): line number within the item that the directory starts on
-
-        Returns:
-                dict: dictionary that splits each line within the directory into a key and a value
-        """
-        directoryInformation = {"type": "directory_information"}
-
-        directoryPossibleKeys = [
-            "Name",
-            "Login",
-            "Computer",
-            "Location",
-            "Email",
-            "Phone",
-            "Office",
-            "UNIX Dir",
-            "Zero Dir",
-            "User ECNDB",
-            "Host ECNDB",
-            "Subject"
-        ]
-        # Executies until the directory start line is greater than the directory ending line
-        while True:
-
-            # Returns the line number at directory start line
-            info = self.__rawItem[directoryStartLine]
-
-            # Breaks the loop if it encountrs a newline, signifying the end of the directory information
-            if info == "\n":
-
-                break
-
-            else:
-
-                # Removes white including space, newlines, and tabs from the directory info line
-                strippedInfo = info.strip()
-
-                # Attempts to find ": " but will accept ":", denoting a blank entry for a directory item
-                if ": " in strippedInfo:
-
-                    # Seperates the directory info line into two variables, the first variable being the key, the second being the value
-                    # swt1
-                    key, value = strippedInfo.split(": ", 1)
-
-                    if key in directoryPossibleKeys:
-                        # Adds the key value pair to the directory info dictionary
-                        directoryInformation[key] = value
-                    else:
-                        # Casts the list type on to a dictionary
-                        dictionaryList = list(directoryInformation)
-                        # Length of dictionary list
-                        lenDictionaryList = len(dictionaryList)
-                        # The last key appended to the directory dictionary
-                        lastKeyAppended = dictionaryList[lenDictionaryList - 1]
-
-                        directoryInformation[lastKeyAppended] = directoryInformation[lastKeyAppended] + \
-                            " " + strippedInfo
-
-                elif ":" in strippedInfo:
-
-                    # Seperates the directory info line into two variables, the first variable being the key, the second being the value
-                    key, value = strippedInfo.split(":", 1)
-
-                    if key in directoryPossibleKeys:
-                        # Adds the key value pair to the directory info dictionary
-                        directoryInformation[key] = value
-                    else:
-                        # Casts the list type on to a dictionary
-                        dictionaryList = list(directoryInformation)
-                        # Length of dictionary list
-                        lenDictionaryList = len(dictionaryList)
-                        # The last key appended to the directory dictionary
-                        lastKeyAppended = dictionaryList[lenDictionaryList - 1]
-
-                        directoryInformation[lastKeyAppended] = directoryInformation[lastKeyAppended] + \
-                            " " + strippedInfo
-
-                # Signifies that this line belongs to the most previous line
-                elif ": " not in strippedInfo and ":" not in strippedInfo:
-                    # Casts the list type on to a dictionary
-                    dictionaryList = list(directoryInformation)
-                    # Length of dictionary list
-                    lenDictionaryList = len(dictionaryList)
-                    # The last key appended to the directory dictionary
-                    lastKeyAppended = dictionaryList[lenDictionaryList - 1]
-
-                    directoryInformation[lastKeyAppended] = directoryInformation[lastKeyAppended] + \
-                        " " + strippedInfo
-            # Counter to denote the end of the directory
-            directoryStartLine = directoryStartLine + 1
-
-        # Returns the directory information dictionary
-        return directoryInformation
-
-    def __assignmentParsing(self, contentStart: int) -> list:
-        """Returns a list with assignment information dictionaries
-
-        Example:
-                Assigned-To: campb303
-                Assigned-To-Updated-Time: Tue, 23 Jun 2020 13:27:00 EDT
-                Assigned-To-Updated-By: campb303
-
-        Args:
-                contentStart (int): line number where the content starts
-
-        Returns:
-                list: [
-                        {"type": "assignment",
-                        "datetime": datetime of the assignment,
-                        "by": user who initiated the assignment,
-                        "to": user who was assigned
-                        },
-                ]
-        """
-        assignmentList = []
-
-        # Assignment Information
-        assignedBy = ""
-        assignedDateTime = ""
-        assignedTo = ""
-
-        # Parses the header looking for assignment delimeters and stores info into their respective variables
-        for headerContent in range(0, contentStart):
-
-            line = self.__rawItem[headerContent]
-
-            # Gets who the Item was assigned to
-            if line.startswith("Assigned-To: "):
-
-                assignedTo = (
-                    re.search("(?<=Assigned-To: )(.*)", line)).group()
-
-            # Gets the date the Item was assigned
-            elif line.startswith("Assigned-To-Updated-Time: "):
-
-                dateFromLine = (
-                    re.search("(?<=Assigned-To-Updated-Time: )(.*)", line)).group()
-
-                assignedDateTime = self.__getFormattedDate(dateFromLine)
-
-            # Gets who assigned the Item
-            elif line.startswith("Assigned-To-Updated-By: "):
-
-                assignedBy = (
-                    re.search("(?<=Assigned-To-Updated-By: )(.*)", line)).group()
-
-                # Appends the assignment to the sections list
-                assignmentList.append(
-                    {"type": "assignment",
-                     "datetime": assignedDateTime,
-                     "by": assignedBy,
-                     "to": assignedTo}
-                )
-
-        return assignmentList
-
-    def __initialMessageParsing(self, content: list) -> dict:
-        """Returns a dictionary with initial message information
-
-        Example:
-                \n
-                Testtest\n
-                \n
-
-        Args:
-                content (list): content of the initial message
-
-        Returns:
-                dict: 
-                "type": "initial_message", 
-                "datetime": datetime the initial message was sent,
-                "from_name": from_name,
-                "from_email": user_email,
-                "to": [{email, name}],
-                "cc": [{email, name}],
-                "subject": initial message subject
-                "content": content of the initial message
-        """
-        initialMessageDictionary = {}
-
-        initialMessageDictionary["type"] = "initial_message"
-
-        # Gets the initial message date from the header
-        rawMessageDateStr = self.__getMostRecentHeaderByType("Date")
-
-        # Sets datetime in the intialMessage dictionary to UTC formatted date
-        initialMessageDictionary["datetime"] = self.__getFormattedDate(
-            rawMessageDateStr)
-
-        initialMessageDictionary["from_name"] = self.__parseFromData(
-            data="userName")
-
-        initialMessageDictionary["from_email"] = self.__parseFromData(
-            data="userEmail")
-
-        # Stores list of dictionaries for the recipients of the initial message
-        initialMessageDictionary["to"] = []
-
-        # Parses the header looking for recipients of the initial message and stores it in a list of tuples
-        rawMessageRecipientsList = email.utils.getaddresses(
-            [self.__getMostRecentHeaderByType("To")])
-
-        # Parses the CC list and stores the cc recipient information in a list of dictionaries
-        for recipients in rawMessageRecipientsList:
-
-            initialMessageDictionary["to"].append(
-                {"name": recipients[0],
-                 "email": recipients[1]}
-            )
-
-        # Stores list of dictionaries for CC information
-        initialMessageDictionary["cc"] = []
-
-        # Parses the header looking for CC recipients of the initial message and stores it in a list of tuples
-        rawMessageCCList = email.utils.getaddresses(
-            [self.__getMostRecentHeaderByType("CC")])
-
-        # Parses the CC list and stores the cc recipient information in a list of dictionaries
-        for ccRecipients in rawMessageCCList:
-
-            initialMessageDictionary["cc"].append(
-                {"name": ccRecipients[0],
-                 "email": ccRecipients[1]}
-            )
-
-        initialMessageDictionary["subject"] = self.__getMostRecentHeaderByType(
-            "Subject")
-
-        # Removes unecessary newlines from the begining and the end of the initial message
-        initialMessageDictionary["content"] = self.__getFormattedSectionContent(
-            content)
-
-        return initialMessageDictionary
-
-    def __editParsing(self, content: list, lineNum: int) -> dict:
-        """Returns a dictionary with edit information
-
-        Example:
-                *** Edited by: campb303 at: 06/23/20 13:27:56 ***\n
-                \n
-                This be an edit my boy\n
-                \n
-                \n
-                \n
-
-        Args:
-                content (list): content of an edit
-                lineNum (int): line number of an edit within an item
-
-        Returns:
-                dict: a dictionary with these keys, 
-                        "type": "edi", 
-                        "by": initiator of the edit,
-                        "datetime": datetime of the edit,
-                        "content": content of the edit
-        """
-
-        # Edit Info dictionary
-        editInfo = {}
-
-        for count, line in enumerate(content):
-            if line == "===============================================\n":
-                errorMessage = "Reply-from-user ending delimter encountered without Reply-from-user starting delimter"
-                return self.__errorParsing(line, lineNum + count + 1, errorMessage)
-
-        editInfo["type"] = "edit"
-
-        delimiterLine = content[0]
-        # Parses for the author of the edit, which is located between the "*** Edited by: " and " at:" substrings
-        try:
-            editInfo["by"] = (
-                re.search("(?<=\*{3} Edited by: )(.*)(?= at:)", delimiterLine)).group()
-        except:
-            errorMessage = "*** Edited by: [username] at: [date and time] ***\n"
-            return self.__errorParsing(delimiterLine, lineNum, errorMessage)
-
-        try:
-            # Parses for the date and time of the edit, which is located between the " at: " and "***\n" substrings
-            dateTimeString = (
-                re.search("(?<= at: )(.*)(?= \*\*\*\n)", delimiterLine)).group()
-        except:
-            # Returns an error message if there is no space after "at:"
-            errorMessage = "*** Edited by: [username] at: [date and time] ***\n"
-            return self.__errorParsing(delimiterLine, lineNum, errorMessage)
-
-        # Attempts to format the date and time into utc format
-        editInfo["datetime"] = self.__getFormattedDate(dateTimeString)
-
-        # Remove the delimiter String and unecessary newlines
-        editInfo["content"] = self.__getFormattedSectionContent(content)
-
-        return editInfo
-
-    def __replyToParsing(self, content: list, lineNum: int) -> dict:
-        """Returns a dictionary with reply to user information
-
-        Example:
-                *** Replied by: campb303 at: 06/23/20 13:28:18 ***\n
-                \n
-                This be a reply my son\n
-                \n
-                Justin\n
-                ECN\n
-                \n
-
-        Args:
-                content (list): content of a reply to user
-                lineNum (int): line number of a reply to user in an item 
-
-        Returns:
-                dict: a dictionary with these keys, 
-                        "type": "reply_to_user", 
-                        "by": initiator of the reply to user,
-                        "datetime": datetime of the reply to user,
-                        "content": content of the reply to user
-        """
-        replyInfo = {}
-
-        replyInfo["type"] = "reply_to_user"
-
-        delimiterLine = content[0]
-
-        for count, line in enumerate(content):
-            if line == "===============================================\n":
-                errorMessage = "Reply-from-user ending delimter encountered without Reply-from-user starting delimter"
-                return self.__errorParsing(line, lineNum + count + 1, errorMessage)
-
-        try:
-            # Parses for the author of the reply, which is located between the "*** Replied by: " and " at:" substrings
-            replyInfo["by"] = (
-                re.search("(?<=\*{3} Replied by: )(.*)(?= at:)", delimiterLine)).group()
-        except:
-            errorMessage = "*** Replied by: [username] at: [date and time] ***\n"
-            return self.__errorParsing(delimiterLine, lineNum, errorMessage)
-
-        # Parses for the date and time of the reply, which is located between the " at: " and "***\n" substrings
-        try:
-            dateTimeString = (
-                re.search("(?<= at: )(.*)(?= \*\*\*\n)", delimiterLine)).group()
-        except:
-            errorMessage = "*** Replied by: [username] at: [date and time] ***\n"
-            return self.__errorParsing(delimiterLine, lineNum, errorMessage)
-
-        # Formats date to UTC
-        replyInfo["datetime"] = self.__getFormattedDate(dateTimeString)
-
-        replyInfo["content"] = self.__getFormattedSectionContent(content)
-
-        return replyInfo
-
-    def __statusParsing(self, content: list, lineNum: int) -> dict:
-        """Returns a dictionary with status information
-
-        Example:
-                *** Status updated by: campb303 at: 6/23/2020 13:26:55 ***\n
-                Dont Delete\n
-
-        Args:
-                content (list): The content of a status update
-                lineNum (int): The line number of a status update in an item
-
-        Returns:
-                dict: a dictionary with these keys, 
-                        "type": "status", 
-                        "by": initiator of the status update,
-                        "datetime": datetime of the status update,
-                        "content": content of the status update
-        """
-        statusInfo = {}
-
-        statusInfo["type"] = "status"
-
-        delimiterLine = content[0]
-
-        for count, line in enumerate(content):
-            if line == "===============================================\n":
-                errorMessage = "Reply-from-user ending delimter encountered without Reply-from-user starting delimter"
-                return self.__errorParsing(line, lineNum + count + 1, errorMessage)
-
-        # Parses for the author of the status change, which is located between the "*** Status updated by: " and " at:" substrings
-        try:
-            statusInfo["by"] = (
-                re.search("(?<=\*{3} Status updated by: )(.*)(?= at:)", delimiterLine)).group()
-        except:
-            errorMessage = "*** Status updated by: [username] at: [date and time] ***\n"
-
-            return self.__errorParsing(delimiterLine, lineNum, errorMessage)
-
-        # Parses for the date and time of the status change, which is located between the " at: " and "***\n" substrings
-        try:
-            dateTimeString = re.search(
-                "(?<= at: )(.*)(?= \*\*\*\n)", delimiterLine).group()
-        except:
-            errorMessage = "*** Status updated by: [username] at: [date and time] ***\n"
-
-            return self.__errorParsing(delimiterLine, lineNum, errorMessage)
-
-        # Formats the date to UTC
-        statusInfo["datetime"] = self.__getFormattedDate(dateTimeString)
-
-        # Remove the delimiter String and unecessary newlines
-        statusInfo["content"] = self.__getFormattedSectionContent(content)
-
-        return statusInfo
-
-    def __userReplyParsing(self, replyContent: list, lineNumber: int) -> dict:
-        """Returns a dictionary with user reply information
-
-        Example:
-                === Additional information supplied by user ===\n
-                \n
-                Subject: Re: Beepboop\n
-                From: Justin Campbell <campb303@purdue.edu>\n
-                Date: Tue, 23 Jun 2020 13:30:45 -0400\n
-                X-ECN-Queue-Original-Path: /home/pier/e/queue/Attachments/inbox/2020-06-23/212-original.txt\n
-                X-ECN-Queue-Original-URL: https://engineering.purdue.edu/webqueue/Attachments/inbox/2020-06-23/212-original.txt\n
-                \n
-                Huzzah!\n
-                \n
-                ===============================================\n
-                \n
-        Args:
-                replyContent (list): The entire section of a reply-from-user
-                lineNumber (int): The line number of the begining of a reply-from-user section within and item
-
-        Returns:
-                dict: a dictionary with these keys, 
-                        "type": "reply_from_user", 
-                        "from_name": name of the user that sent the reply,
-                        "from_email": email of the user that sent the reply,
-                        "subject": subject of the reply,
-                        "datetime": the datetime of the reply,
-                        "cc": [
-                                {"name": name of the carbon copied recipient,
-                                "email": email of the carbon copied recipient
-                                },
-                        ]
-                        "content": content of the reply
-                        "headers": [
-                                {"type": headerType,
-                                "content": content
-                                },
-                        ]
-        """
-        replyFromInfo = {}
-
-        replyFromInfo["type"] = "reply_from_user"
-
-        replyFromHeaders = []
-        newLineCounter = 0
-        endingDelimiterCount = 0
-
-        # Delimiter information line numbers to remove from reply from user
-        linesToRemove = []
-
-        # Parses the section content looking for any line that starts with a metadata, also tracks the line
-        # number with the enumerate function
-        for lineNum, line in enumerate(replyContent):
-
-            if endingDelimiterCount == 0 and lineNum == len(replyContent) - 1:
-                errorMessage = "Did not encounter a reply-from-user ending delimiter"
-                return self.__errorParsing(line, lineNumber + lineNum + 1, errorMessage)
-
-            if newLineCounter == 1 and line != "\n":
-
-                try:
-                    # Append header information for each headr line
-                    headerType, content = line.split(": ", 1)
-                    replyFromHeaders.append(
-                        {"type": headerType,
-                         "content": content
-                         }
-                    )
-                except:
-                    lenReplyFromHeaders = len(replyFromHeaders)
-                    if lenReplyFromHeaders == 0:
-                        errorMessage = ("Expected reply-from-user header information:\n" +
-                                        "=== Additional information supplied by user ===\n" +
-                                        "\n" +
-                                        "[Header Type]: [Header Value]\n" +
-                                        "\n"
-                                        )
-                        return self.__errorParsing(line, lineNumber + lineNum + 1, errorMessage)
-
-                    else:
-                        replyFromHeaders[lenReplyFromHeaders -
-                                         1]["content"] = replyFromHeaders[lenReplyFromHeaders - 1]["content"] + " " + line
-
-                linesToRemove.append(lineNum)
-            # Checks for a newline and breaks for loop on second occurance of a newline
-            if line == "\n":
-                newLineCounter = newLineCounter + 1
-
-                if newLineCounter == 2 and "datetime" not in replyFromInfo.keys():
-                        errorMessage = "Expected \"Date: [datetime]\" in the header info"
-                        return self.__errorParsing(line, lineNumber + lineNum + 1, errorMessage)
-
-            elif line == "===============================================\n":
-                endingDelimiterCount = endingDelimiterCount + 1
-
-            elif line.startswith("From: ") and newLineCounter == 1:
-                # Returns a list of one tuples with a name stored in the first index of the tuple and an email stored in the second index of the tuple
-                emailList = email.utils.getaddresses([line])
-                replyFromInfo["from_name"] = emailList[0][0]
-                replyFromInfo["from_email"] = emailList[0][1]
-
-            elif line.startswith("Subject: ") and newLineCounter == 1:
-                # Matches everything after "Subject: "
-                try:
-                    subjectStr = (
-                        re.search("(?<=Subject: )(.*)", line)).group()
-                except:
-                    errorMessage = "Expeted syntax of \"Subject: [subject]\""
-                    return self.__errorParsing(line, lineNumber + lineNum + 1, errorMessage)
-
-                # Formatts the date to UTC
-                replyFromInfo["subject"] = subjectStr
-
-            elif line.startswith("Date: ") and newLineCounter == 1:
-                # Matches everything after "Date: "
-                try:
-                    dateStr = (re.search("(?<=Date: )(.*)", line)).group()
-                except:
-                    errorMessage = "\"Date: [datetime]\""
-                    return self.__errorParsing(line, lineNumber + lineNum + 1, errorMessage)
-
-                # Formatts the date to UTC
-                replyFromInfo["datetime"] = self.__getFormattedDate(dateStr)
-
-            elif line.startswith("Cc: ") and newLineCounter == 1:
-
-                replyFromInfo["cc"] = []
-
-                # Returns a list of tuples with email information
-                recipientsList = email.utils.getaddresses([line])
-
-                # Parses through the cc tuple list
-                for cc in recipientsList:
-                    # Stores the cc information in a dictionary and appends it to the ccRecipientsList
-                    replyFromInfo["cc"].append(
-                        {"name": cc[0],
-                         "email": cc[1]}
-                    )
-
-        # Deletes reduntant lines from the message content in reverse order
-        for lineNum in sorted(linesToRemove, reverse=True):
-            replyContent.pop(lineNum)
-
-        # Strips any unnecessary newlines or any delimiters frm the message content
-        replyFromInfo["content"] = self.__getFormattedSectionContent(
-            replyContent)
-
-        replyFromInfo["headers"] = replyFromHeaders
-
-        return replyFromInfo
-
-    def __getFormattedSectionContent(self, sectionContent: list) -> list:
-        """Returns a list with message content that is stripped of unnecessary newlines and begining delimiters
-
-        Example:
-                *** Edited by: mph at: 02/21/20 10:27:16 ***\n
-                \n
-                Still need to rename machines - but the networking issue now seems to \n
-                be resolved via another ticket.\n
-                \n
-                \n
-                \n
-                \n
-                \n
-
-        Args:
-                sectionContent (list): The section content of a parsed section
-
-        Returns:
-                list: the section content of a parsed section without any delimiters and unnecessary newlines
-        """
-        # Continually removes the first line of sectionContent if it is a newline or delimiter in each iteration
-        while len(sectionContent) > 1:
-            if (sectionContent[0] == "\n" or
-                    sectionContent[0].startswith("*** Edited by: ") or
-                    sectionContent[0].startswith("*** Replied by: ") or
-                    sectionContent[0].startswith("*** Status updated by: ") or
-                    sectionContent[0] == "=== Additional information supplied by user ===\n" or
-                    sectionContent[0] == "===============================================\n"
-                    ):
-                sectionContent.pop(0)
-            else:
-                # Breaks the loop if the first line isn't a newline or delimiter
-                break
-
-        # Continually removes the last line of sectionContent if it is a newline or delimiter in each iteration
-        while len(sectionContent) > 1:
-            # Initializes the Length of sectionContent each iteration of the loop
-            sectionContentLength = len(sectionContent)
-
-            if (sectionContent[sectionContentLength - 1] == "\n" or
-                    sectionContent[sectionContentLength -
-                                   1] == "===============================================\n"
-                    ):
-                sectionContent.pop(sectionContentLength - 1)
-            else:
-                # Breaks the loop if the last line isn't a newline or delimiter
-                break
-
-        return sectionContent
-
-    def __errorParsing(self, line: str, lineNum: int, expectedSyntax: str) -> dict:
-        """Returns a dictionary with error parse information when a line is malformed
-
-        Example:
-                "*** Status updated by: ewhile at: 5/7/2020 10:59:11 *** sharing between\n"
-
-        Args:
-                line (str): line of that threw error
-                lineNum (int): line number in the item that threw error
-                expectedSyntax (str): a message stating the syntax the line should follow
-
-        Returns:
-                dict: a dictionary with these keys, 
-                        "type": "parse_error", 
-                        "datetime": time the error was encountered,
-                        "file_path": path of the item with erroneos line,
-                        "expected": expectedSyntax,
-                        "got": line,
-                        "line_num": lineNum
-        """
-        errorDictionary = {}
-
-        # Type
-        errorDictionary["type"] = "parse_error"
-
-        # Dateime of the parse error
-        errorDictionary["datetime"] = self.__getFormattedDate(
-            str(datetime.datetime.now()))
-
-        # Item filepath
-        errorDictionary["file_path"] = self.__path
-
-        # Expected value
-        errorDictionary["expected"] = expectedSyntax
-
-        # line that threw error
-        errorDictionary["got"] = line
-
-        # line number that threw error
-        errorDictionary["line_num"] = lineNum
-
-        # returns the error dictionary
-        return errorDictionary
-
-    def __getSortedSections(self, sectionsList: list) -> list:
-        """Sorts the sections chronologically by datetime
-
-        Example:
-                [example] need to do
-
-        Args:
-                sections (list): the list of sections to be sorted
-
-        Returns:
-                list: a list of sections sorted by datetime
-        """
-        sectionsLength = len(sectionsList)
-        sortedSections = []
-        oldestSection = {}
-
-        while len(sortedSections) < sectionsLength:
-
-            for iteration, currentSection in enumerate(sectionsList):
-
-                if currentSection["type"] == "directory_information":
-                    sortedSections.append(currentSection)
-                    sectionsList.remove(currentSection)
-                    break
-
-                if iteration == 0:
-                    oldestSection = currentSection
-
-                #datetime.datetime.strptime(date_time_str, '%Y-%m-%d %H:%M:%S.%f')
-
-                elif parse(currentSection["datetime"]) < parse(oldestSection["datetime"]):
-                    oldestSection = currentSection
-
-                if iteration == len(sectionsList) - 1:
-                    sortedSections.append(oldestSection)
-                    sectionsList.remove(oldestSection)
-
-        return sortedSections
-
-    def __isLocked(self) -> Union[str, bool]:
-        """Returns a string info about the lock if true and a bool False if false
-
-        Example: A file is locked
-                "CE 100 is locked by campb303 using qvi"
-
-        Example: a file is not locked
-                False
-
-        Returns:
-                Union[str, bool]: String with info about lock if true, bool False if false
-        """
-        lockFile = self.__path + ".lck"
-        if os.path.exists(lockFile):
-            with open(lockFile) as file:
-                lockInfo = file.readline().split(" ")
-                lockedBy = lockInfo[4]
-                lockedUsing = lockInfo[1]
-                return "{queue} {number} is locked by {lockedBy} using {lockedUsing}".format(queue=self.queue, number=self.number, lockedBy=lockedBy, lockedUsing=lockedUsing)
-        else:
-            return False
-
-    def __getMostRecentHeaderByType(self, headerType: str) -> str:
-        """Return the data of most recent header of the given type. 
-        If no header of that type exists, return an empty string.
-
-        Example: Requesting a Status header that does exist
-                __getMostRecentHeaderByType("Status")
-                becomes  "Waiting for Reply"
-
-        Example: Requesting a Status header that doesn't exist
-                __getMostRecentHeaderByType("Status")
-                becomes ""
-
-        Args:
-                headerType (str): Type of header to return.
-
-        Returns:
-                str: data of most recent header of the given type or empty string.
-        """
-        for header in self.headers:
-            if header["type"] == headerType:
-                return header["content"]
-        return ""
-
-    def __parseFromData(self, data: str) -> str:
-        """Parse From header and return requested data.
-        Returns empty string if requested data is unavailable.
-
-        Examples: From data is "From: Campbell, Justin <campb303@purdue.edu>"
-                __parseFromData(data="userName") returns "Campbell, Justin"
-                __parseFromData(data="userEmail") returns "campb303@purdue.edu"
-
-        Args:
-                data (str): The data desired; can be "userName" or "userEmail".
-
-        Returns:
-                str: userName, userEmail or empty string.
-        """
-        fromHeader = self.__getMostRecentHeaderByType("From")
-        userName, userEmail = email.utils.parseaddr(fromHeader)
-
-        if data == "userName":
-            return userName
-        elif data == "userEmail":
-            return userEmail
-        else:
-            raise ValueError(
-                "data='" + str(data) + "' is not a valid option. data must be \"userName\" or \"userEmail\".")
-
-    def __getUserAlias(self) -> str:
-        """Returns user's Career Account alias if present.
-        If Career Account alias isn't present, returns empty string.
-
-        Example: Email from campb303@purdue.edu
-                userAlias = "campb303"
-
-        Example: Email from spam@spammer.net
-                userAlias = "" 
-
-        Returns:
-                str: User's Career Account alias if present or empty string
-        """
-
-        
-        try:
-            emailUser, emailDomain = self.userEmail.split("@")
-
-        # Returns an error parse if the self.useremail doesn't contain exactally one "@" symbol
-        except ValueError:
-            # Parses through the self.headers list to find the "From" header and its line number
-            for lineNum, header in enumerate(self.headers):
-                if header["type"] == "From":
-                    headerString = header["type"] + ": " + header["content"]
-                    return self.__errorParsing(headerString, lineNum + 1, "Expected valid email Address")
-
-        return emailUser if emailDomain.endswith("purdue.edu") else ""
-
-    def __getFormattedDate(self, date: str) -> str:
-        """Returns the date/time formatted as RFC 8601 YYYY-MM-DDTHH:MM:SS+00:00.
-        Returns empty string if the string argument passed to the function is not a datetime.
-        See: https://en.wikipedia.org/wiki/ISO_8601
-
-        Returns:
-                str: Properly formatted date/time recieved or empty string.
-        """
-        try:
-            # This date is never meant to be used. The default attribute is just to set timezone.
-            parsedDate = parse(date, default=datetime.datetime(
-                1970, 1, 1, tzinfo=tz.gettz('EDT')))
-        except:
-            return ""
-
-        parsedDateString = parsedDate.strftime("%Y-%m-%dT%H:%M:%S%z")
-
-        return parsedDateString
-
-    def toJson(self) -> dict:
-        """Returns a JSON safe representation of the item.
-
-        Returns:
-                dict: JSON safe representation of the item.
-        """
-        return self.jsonData
-
-    def __repr__(self) -> str:
-        return self.queue + str(self.number)
-
-# TODO: Make Queue iterable using __iter__. See: https://thispointer.com/python-how-to-make-a-class-iterable-create-iterator-class-for-it/
-class Queue:
-    """A collection of items.
-
-    Example:
-            # Create a queue (ce)
-            >>> queue = Queue("ce")
-
-    Attributes:
-            name: The name of the queue.
-            items: A list of Items in the queue.
-            jsonData: A JSON serializable representation of the Queue.
-    """
-
-    def __init__(self, name: str) -> None:
-        self.name = name
-        self.__directory = queueDirectory + "/" + self.name + "/"
-        self.items = self.__getItems()
-
-        self.jsonData = {
-            "name": self.name,
-            "length": len(self)
-        }
-
-    def __getItems(self) -> list:
-        """Returns a list of items for this Queue
-
-        Returns:
-                list: a list of items for this Queue
-        """
-        items = []
-
-        for item in os.listdir(self.__directory):
-            itemPath = self.__directory + "/" + item
-
-            isFile = True if os.path.isfile(itemPath) else False
-
-            if isFile and isValidItemName(item):
-                items.append(Item(self.name, item))
-
-        return items
-
-    def toJson(self) -> dict:
-        """Return JSON safe representation of the Queue
-
-        The JSON representation of every item in the Queue is added to the
-        Queue's JSON data then the Queue's JSON data is returned.
-
-        Returns:
-                dict: JSON safe representation of the Queue
-        """
-        items = []
-        for item in self.items:
-            items.append(item.toJson())
-        self.jsonData["items"] = items
-
-        return self.jsonData
-
-    def __len__(self) -> int:
-        return len(self.items)
-
-    def __repr__(self) -> str:
-        return f'{self.name}_queue'
-
-def getValidQueues() -> list:
-    """Returns a list of queues on the filesystem excluding ignored queues.
-
-    Example:
-            ["bidc", "me", "ce"]
-
-    Returns:
-            list: Valid queues
-    """
-    queues = []
-
-    for file in os.listdir(queueDirectory):
-        currentFile = queueDirectory + "/" + file
-        isDirectory = os.path.isdir(currentFile)
-        isValid = file not in queuesToIgnore
-
-        if isDirectory and isValid:
-            queues.append(file)
-
-    return queues
-
-def getQueueCounts() -> list:
-    """Returns a list of dictionaries with the number of items in each queue.
-
-    Example:
-            [
-                {
-                    name: "me",
-                    number_of_items: 42
-                },
-                {
-                    name: "bidc",
-                    number_of_items: 3
-                }
-            ]
-
-    Returns:
-            list: Dictionaries with the number of items in each queue.
-    """
-    queueInfo = []
-    for queue in getValidQueues():
-        possibleItems = os.listdir(queueDirectory + "/" + queue)
-        validItems = [isValidItemName for file in possibleItems]
-        queueInfo.append( {"name": queue, "number_of_items": len(validItems)} )
-    
-    # Sorts list of queue info alphabetically
-    sortedQueueInfo = sorted(queueInfo, key = lambda queueInfoList: queueInfoList['name'])
-
-    return sortedQueueInfo
-        
-
-def loadQueues() -> list:
-    """Return a list of Queues for each queue.
-
-    Returns:
-        list: list of Queues for each queue.
-    """
-    queues = []
-
-    for queue in getValidQueues():
-        queues.append(Queue(queue))
-
-    return queues
\ No newline at end of file
diff --git a/api.py b/api.py
deleted file mode 100644
index 73128f6..0000000
--- a/api.py
+++ /dev/null
@@ -1,248 +0,0 @@
-from flask import Flask, request, after_this_request
-from flask_restful import Api, Resource
-from flask_jwt_extended import (
-    JWTManager, create_access_token, create_refresh_token,
-    jwt_required, get_jwt_identity, jwt_refresh_token_required,
-    set_refresh_cookies, unset_refresh_cookies
-)
-import os, dotenv
-from easyad import EasyAD
-from ldap.filter import escape_filter_chars
-# pylint says this is an error but it works so ¯\_(ツ)_/¯
-from ldap import INVALID_CREDENTIALS as LDAP_INVALID_CREDENTIALS
-import ECNQueue
-
-# Load envrionment variables for ./.env
-dotenv.load_dotenv()
-
-# Create Flask App
-app = Flask(__name__)
-
-# Create API Interface
-api = Api(app)
-
-
-################################################################################
-# Configure Flask-JWT-Extended
-################################################################################
-
-# Set JWT secret key and create JWT manager
-app.config["JWT_SECRET_KEY"] = os.environ.get("JWT_SECRET_KEY")
-# Set identity claim field key to sub for JWT RFC complience
-# Flask-JWT-Extended uses 'identity' by default for compatibility reasons
-app.config["JWT_IDENTITY_CLAIM"] = "sub"
-# Set the key for error messages generated by Flask-JWT-Extended
-app.config["JWT_ERROR_MESSAGE_KEY"] = "message"
-
-# Look for JWTs in headers (for access) then cookies (for refresh)
-app.config["JWT_TOKEN_LOCATION"] = ["headers", "cookies"]
-# Restrict cookies to HTTPS in prod, allow HTTP in dev
-app.config["JWT_COOKIE_SECURE"] = False if os.environ.get("ENVIRONMENT") == "dev" else True
-# Restrict cookies using SameSite=strict flag
-app.config["JWT_COOKIE_SAMESITE"] = "strict"
-# Restrict refresh tokens to /token/refresh endpoint
-app.config["JWT_REFRESH_COOKIE_PATH"] = '/tokens/refresh'
-# Set the cookie key for CRSF validation string
-# This is the default value. Adding it for easy reference
-app.config["JWT_REFRESH_CSRF_HEADER_NAME"] = "X-CSRF-TOKEN"
-
-tokenManager = JWTManager(app)
-
-
-
-def user_is_valid(username: str, password: str) -> bool:
-    """Checks if user is valid and in webqueue2 login group.
-
-    Args:
-        username (str): Career account username.
-        password (str): Career account passphrase.
-
-    Returns:
-        bool: True if user is valid, otherwise False.
-    """
-
-    # Check for empty arguments
-    if (username == "" or password == ""):
-        return False
-
-    # Initialize EasyAD
-    config = {
-        "AD_SERVER": "boilerad.purdue.edu",
-        "AD_DOMAIN": "boilerad.purdue.edu"
-    }
-    ad = EasyAD(config)
-
-    # Prepare search critiera for Active Directory
-    credentials = {
-        "username": escape_filter_chars(username),
-        "password": password
-    }
-    attributes = [ 'cn', "memberOf" ]
-    filter_string = f'(&(objectClass=user)(|(sAMAccountName={username})))'
-
-    # Do user search
-    try:
-        user = ad.search(credentials=credentials, attributes=attributes, filter_string=filter_string)[0]
-    except LDAP_INVALID_CREDENTIALS:
-        return False
-    
-    # Isolate group names
-        # Example:
-        #	'CN=00000227-ECNStuds,OU=BoilerADGroups,DC=BoilerAD,DC=Purdue,DC=edu' becomes
-        # 	`00000227-ECNStuds`
-    user_groups = [ group.split(',')[0].split('=')[1] for group in user["memberOf"] ]
-
-    # Check group membership
-    webqueue_login_group = "00000227-ECN-webqueue"
-    if webqueue_login_group not in user_groups:
-        return False
-
-    return True
-
-
-
-class Login(Resource):
-    def post(self) -> tuple:
-        """Validates username/password and returns both access and refresh tokens.
-
-        Return Codes:
-                200 (OK): On success.
-                401 (Unauthroized): When username or password are incorrect.
-                422 (Unprocessable Entitiy): When the username or password can't be parsed.
-
-        Example:
-                curl -X POST
-                    -H "Content-Type: application/json" 
-                    -d '{"username": "bob", "password": "super_secret"}'
-
-                { "access_token": fjr09hfp09h932jp9ruj3.3r8ihf8h0w8hr08ifhj804h8i.8h48ith08ity409hip0t4 }
-
-        Returns:
-                tuple: Response containing tokens and HTTP response code.
-        """
-        if not request.is_json:
-            return ({ "message": "JSON missing from request body"}, 422)
-        
-        data = request.json
-
-        fields_to_check = ["username", "password"]
-        for field in fields_to_check:
-            if field not in data.keys():
-                return ({ "message": f"{field} missing from request body"}, 422)
-        
-        if not user_is_valid(data["username"], data["password"]):
-            return ({ "message": "Username or password is invalid"}, 401)
-
-        access_token = create_access_token(data["username"])
-        refresh_token = create_refresh_token(data["username"])
-
-        # This decorator is needed because Flask-RESTful's 'resourceful routing`
-        # doesn't allow for direct modification to the Flask response object.
-        # See: https://flask-restful.readthedocs.io/en/latest/quickstart.html#resourceful-routing
-        @after_this_request
-        def _does_this_work(response):
-            set_refresh_cookies(response, refresh_token)
-            return response
-
-        return ({ "access_token": access_token }, 200)
-
-class RefreshAccessToken(Resource):
-    @jwt_refresh_token_required
-    def post(self):
-        username = get_jwt_identity()
-        access_token = create_access_token(username)
-        return ({"access_token": access_token}, 200)
-
-class Item(Resource):
-    @jwt_required
-    def get(self, queue: str, number: int) -> tuple:
-        """Returns the JSON representation of the item requested.
-
-        Return Codes:
-                200 (OK): On success.
-
-        Example:
-            /api/ce/100 returns:
-            {
-                "lastUpdated": "07-23-20 10:11 PM",
-                "headers": [...],
-                "content": [...],
-                "isLocked": "ce 100 is locked by knewell using qvi",
-                "userEmail": "campb303@purdue.edu",
-                "userName": "Justin Campbell",
-                "userAlias": "campb303",
-                "assignedTo": "campb303",
-                "subject": "Beepboop",
-                "status": "Dont Delete",
-                "priority": "",
-                "deparment": "",
-                "building": "",
-                "dateReceived": "Tue, 23 Jun 2020 13:25:51 -0400"
-            }
-
-        Args:
-            queue (str): The queue of the item requested.
-            item (int): The number of the item requested.
-
-        Returns:
-            tuple: Item as JSON and HTTP response code.
-        """
-        return (ECNQueue.Item(queue, number).toJson(), 200)
-
-class Queue(Resource):
-    @jwt_required
-    def get(self, queues: str) -> tuple:
-        """Returns the JSON representation of the queue requested.
-
-        Return Codes:
-                200 (OK): On success.
-
-        Args:
-            queues (str): Plus (+) deliminited list of queues.
-
-        Returns:
-            tuple: Queues as JSON and HTTP response code.
-        """
-        queues_requested = queues.split("+")
-
-        queue_list = []
-        for queue in queues_requested:
-            queue_list.append(ECNQueue.Queue(queue).toJson())
-
-        return (queue_list, 200)
-
-class QueueList(Resource):
-    @jwt_required
-    def get(self) -> tuple:
-        """Returns a list of dictionaries with the number of items in each queue.
-
-        Return Codes:
-                200 (OK): On success.
-
-        Example:
-                [
-                    {
-                        name: "me",
-                        number_of_items: 42
-                    },
-                    {
-                        name: "bidc",
-                        number_of_items: 3
-                    }
-                ]
-
-        Returns:
-                tuple: Queues and item counts as JSON and HTTP response code.
-        """
-        return (ECNQueue.getQueueCounts(), 200)
-
-
-
-api.add_resource(Login, "/login")
-api.add_resource(RefreshAccessToken, "/tokens/refresh")
-api.add_resource(Item, "/api/<string:queue>/<int:number>")
-api.add_resource(Queue, "/api/<string:queues>")
-api.add_resource(QueueList, "/api/get_queues")
-
-if __name__ == "__main__":
-    app.run()
\ No newline at end of file

From 17e60e7ad61663ece3903ad769e558e699e7bde6 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 10:19:20 -0400
Subject: [PATCH 64/75] Remove unnecceary __init__=

Co-authored-by: Jacob Daniel Bennett <benne238@purdue.edu>
---
 __init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 __init__.py

diff --git a/__init__.py b/__init__.py
deleted file mode 100644
index e69de29..0000000

From f8cf5b80ff027842baac48fe553c5faa9c88f174 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 10:39:54 -0400
Subject: [PATCH 65/75] Re-enable authentication for Item in API

---
 src/webqueue2api/api/resources/queue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webqueue2api/api/resources/queue.py b/src/webqueue2api/api/resources/queue.py
index 385caba..ccc5fc8 100644
--- a/src/webqueue2api/api/resources/queue.py
+++ b/src/webqueue2api/api/resources/queue.py
@@ -7,7 +7,7 @@
 
 
 class Queue(Resource):
-    # @jwt_required
+    @jwt_required
     def get(self, queues: str) -> tuple:
         """Returns the JSON representation of the queue requested.
 

From 13a409392e4004df7a38b7e07b5bca49707f3bc0 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 10:40:05 -0400
Subject: [PATCH 66/75] Fix broken reference

---
 src/webqueue2api/parser/queue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webqueue2api/parser/queue.py b/src/webqueue2api/parser/queue.py
index 4c4586f..9351591 100644
--- a/src/webqueue2api/parser/queue.py
+++ b/src/webqueue2api/parser/queue.py
@@ -67,7 +67,7 @@ def to_json(self) -> dict:
         """
         items = []
         for item in self.items:
-            items.append(item.toJson())
+            items.append(item.to_json())
         self.json_data["items"] = items
 
         return self.json_data

From a171acc944e7291429f196e236867aff48362e6e Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 11:08:59 -0400
Subject: [PATCH 67/75] Add docstring format

---
 docstring-format.mustache | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 docstring-format.mustache

diff --git a/docstring-format.mustache b/docstring-format.mustache
new file mode 100644
index 0000000..7fc2a20
--- /dev/null
+++ b/docstring-format.mustache
@@ -0,0 +1,38 @@
+{{! Google Docstring Template }}
+{{summaryPlaceholder}}
+
+{{extendedSummaryPlaceholder}}
+
+Example:
+        [example]
+
+{{#parametersExist}}
+Args:
+{{#args}}
+        {{var}} ({{typePlaceholder}}): {{descriptionPlaceholder}}
+{{/args}}
+{{#kwargs}}
+        {{var}} ({{typePlaceholder}}, optional): {{descriptionPlaceholder}}. Defaults to {{&default}}.
+{{/kwargs}}
+{{/parametersExist}}
+
+{{#exceptionsExist}}
+Raises:
+{{#exceptions}}
+        {{type}}: {{descriptionPlaceholder}}
+{{/exceptions}}
+{{/exceptionsExist}}
+
+{{#returnsExist}}
+Returns:
+{{#returns}}
+        {{typePlaceholder}}: {{descriptionPlaceholder}}
+{{/returns}}
+{{/returnsExist}}
+
+{{#yieldsExist}}
+Yields:
+{{#yields}}
+        {{typePlaceholder}}: {{descriptionPlaceholder}}
+{{/yields}}
+{{/yieldsExist}}
\ No newline at end of file

From c4e8532c63e71398610d6ae0ce7cfddb550f1775 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 11:09:36 -0400
Subject: [PATCH 68/75] Auto populate Item.json_data

---
 src/webqueue2api/parser/item.py | 63 +++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/webqueue2api/parser/item.py b/src/webqueue2api/parser/item.py
index 592fe6f..a9daa4d 100644
--- a/src/webqueue2api/parser/item.py
+++ b/src/webqueue2api/parser/item.py
@@ -72,26 +72,51 @@ def __init__(self, queue: str, number: int) -> None:
         self.department = self.__get_most_recent_header_by_type("Department")
         self.building = self.__get_most_recent_header_by_type("Building")
         self.date_received = self.__get_formatted_date(self.__get_most_recent_header_by_type("Date"))
+        self.json_data = self.__generate_json_data()
 
-        # TODO: Autopopulate jsonData w/ __dir__() command. Exclude `^_` and `jsonData`.
-        self.json_data = {
-            "queue": self.queue,
-            "number": self.number,
-            "lastUpdated": self.last_updated,
-            "headers": self.headers,
-            "content": self.content,
-            "isLocked": self.is_locked,
-            "userEmail": self.user_email,
-            "userName": self.user_name,
-            "userAlias": self.user_alias,
-            "assignedTo": self.assigned_to,
-            "subject": self.subject,
-            "status": self.status,
-            "priority": self.priority,
-            "department": self.department,
-            "building": self.building,
-            "dateReceived": self.date_received
-        }
+    def __generate_json_data(self) -> dict:
+        """Generates a JSON serializable data dictionary of class attributes.
+
+        Example:
+                __generate_json_data() returns:
+                {
+                    "assigned_to": 'bekuma',
+                    "building": '',
+                    "content": [...],
+                    "date_received": '2020-08-20T22: 06: 08+0000',
+                    "departmen"': '',
+                    "headers": [...],
+                    "is_locked"': False,
+                    "last_updated": '2021-06-04T11: 01: 00-0400',
+                    "number": 1,
+                    "path": '/home/pier/e/queue/Mail/ce/1',
+                    "priority": '',
+                    "queue": 'ce',
+                    "status": 'archiving from zsite',
+                    "subject": 'RE: Updating my computer',
+                    "user_alias": 'govind',
+                    "user_email": 'govind@purdue.edu',
+                    "user_name": 'Govindaraju, Rao S'
+                }
+
+        Returns:
+                dict: JSON serializable data dictionary of class attributes.
+        """
+        json_data = {}
+
+        # List of attributes that need processing before being added to json_data
+        attributes_to_process = ["path"]
+        for attribute in attributes_to_process:
+            if attribute == "path":
+                json_data[attribute] = str(self.path)
+
+        # List of attributes to be ignored
+        attributes_to_ignore = ["to_json", "json_data"] + attributes_to_process
+        for attribute in self.__dir__():
+            if not attribute.startswith("_") and attribute not in attributes_to_ignore:
+                json_data[attribute] = self.__getattribute__(attribute)
+
+        return json_data
 
     def __get_time_last_updated(self) -> str:
         """Returns last modified time of item reported by the filesystem in mm-dd-yy hh:mm am/pm format.

From b72ae741c9141f35c6cfc97e12e441aeda2530cc Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 11:16:15 -0400
Subject: [PATCH 69/75] Correct mis-spelled parse_eaders to parse_headers and
 added header only loading with args docs

---
 src/webqueue2api/parser/item.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/webqueue2api/parser/item.py b/src/webqueue2api/parser/item.py
index a9daa4d..185b2b4 100644
--- a/src/webqueue2api/parser/item.py
+++ b/src/webqueue2api/parser/item.py
@@ -18,6 +18,11 @@
 class Item:
     """A single issue.
 
+    Args:
+            queue (str): The name of the Item's queue.
+            number (int): The number of the Item.
+            headersOnly (bool, optional): Whether or not to parse headers only. Defaults to False.
+
     Example:
             # Create an Item (ce100)
             `item = Item("ce", 100)`
@@ -45,7 +50,7 @@ class Item:
             ItemDoesNotExistError: If an item does not exist on the filesystem.
     """
 
-    def __init__(self, queue: str, number: int) -> None:
+    def __init__(self, queue: str, number: int, headers_only: bool = False) -> None:
         self.queue = queue
 
         try:
@@ -59,8 +64,8 @@ def __init__(self, queue: str, number: int) -> None:
 
         self.last_updated = self.__get_time_last_updated()
         self.__raw_tem = self.__get_raw_item()
-        self.headers = self.__parse_eaders()
-        self.content = self.__parseSections()
+        self.headers = self.__parse_headers()
+        if not headers_only: self.content = self.__parseSections()
         self.is_locked = self.__check_is_locked()
         self.user_email = self.__parse_from_data(data="user_email")
         self.user_name = self.__parse_from_data(data="user_name")
@@ -155,7 +160,7 @@ def __get_header_boundary(self) -> int:
             if line == "\n":
                 return line_number
 
-    def __parse_eaders(self) -> list:
+    def __parse_headers(self) -> list:
         """Returns a list containing dictionaries of header type and data.
         Removes queue prefixes and whitespace.
 

From 48318aca7e1c05f4e4893458df610b16bee1f45d Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 11:17:35 -0400
Subject: [PATCH 70/75] Correct docstring

---
 src/webqueue2api/parser/item.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webqueue2api/parser/item.py b/src/webqueue2api/parser/item.py
index 185b2b4..27ea817 100644
--- a/src/webqueue2api/parser/item.py
+++ b/src/webqueue2api/parser/item.py
@@ -21,7 +21,7 @@ class Item:
     Args:
             queue (str): The name of the Item's queue.
             number (int): The number of the Item.
-            headersOnly (bool, optional): Whether or not to parse headers only. Defaults to False.
+            headers_only (bool, optional): Whether or not to parse headers only. Defaults to False.
 
     Example:
             # Create an Item (ce100)

From 51bddfaa30ca1863d41a709554bd12054677060f Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 11:26:52 -0400
Subject: [PATCH 71/75] Add headers only loading to Queue

---
 src/webqueue2api/parser/queue.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/webqueue2api/parser/queue.py b/src/webqueue2api/parser/queue.py
index 9351591..5276b47 100644
--- a/src/webqueue2api/parser/queue.py
+++ b/src/webqueue2api/parser/queue.py
@@ -26,21 +26,24 @@ class Queue:
             QueueDoesNotExistError: If a queue's directory does not exist on the filesystem.
     """
 
-    def __init__(self, name: str) -> None:
+    def __init__(self, name: str, headers_only: bool = True) -> None:
         self.name = name
         self.path = Path(config.queue_directory, self.name)
         if not self.path.exists():
             raise QueueDoesNotExistError(str(self.path))
 
-        self.items = self.get_items()
+        self.items = self.get_items(headers_only=headers_only)
 
         self.json_data = {
             "name": self.name,
         }
 
-    def get_items(self) -> list:
+    def get_items(self, headers_only: bool) -> list:
         """Returns a list of items for this Queue
 
+        Args:
+                headers_only (bool): If True, loads Item headers.
+
         Returns:
                 list: a list of items for this Queue
         """
@@ -52,7 +55,7 @@ def get_items(self) -> list:
             is_file = True if os.path.isfile(item_path) else False
 
             if is_file and is_valid_item_name(item):
-                items.append(Item(self.name, item))
+                items.append(Item(self.name, item, headers_only))
 
         return items
 
@@ -92,6 +95,7 @@ def is_valid_item_name(name: str) -> bool:
 
     Args:
             name (str): The name to test.
+            headers_only (bool, optional): Whether or not to parse headers only. Defaults to True.
 
     Returns:
             bool: Name is valid item name.

From fb8b46e9fbb61b0706a60787cd643de63d505106 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 11:32:08 -0400
Subject: [PATCH 72/75] Add headers_only query string parsing to Item resource

---
 src/webqueue2api/api/resources/item.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/webqueue2api/api/resources/item.py b/src/webqueue2api/api/resources/item.py
index c1380f1..9f1b147 100644
--- a/src/webqueue2api/api/resources/item.py
+++ b/src/webqueue2api/api/resources/item.py
@@ -1,3 +1,4 @@
+from flask import request
 from flask_restful import Resource
 from flask_jwt_extended import jwt_required
 # To avoid naming conflicts
@@ -11,6 +12,7 @@ def get(self, queue: str, number: int) -> tuple:
 
         Return Codes:
                 200 (OK): On success.
+                404 (Not Found): When an Item does not exist.
 
         Example:
             /api/ce/100 returns:
@@ -38,7 +40,9 @@ def get(self, queue: str, number: int) -> tuple:
         Returns:
             tuple: Item as JSON and HTTP response code.
         """
+        headers_only = True if request.args.get("headers_only") == "True" else False
+
         try:
-            return (_Item(queue, number).to_json(), 200)
+            return (_Item(queue, number, headers_only=headers_only).to_json(), 200)
         except ItemDoesNotExistError:
             return ({"message": f"Item {queue}{number} not found."}, 404)
\ No newline at end of file

From 83be4a26983f0b1f6ca1165baf8a046c7c29499e Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 11:37:12 -0400
Subject: [PATCH 73/75] Add headers_only query string parsing to Queue resource

---
 src/webqueue2api/api/resources/queue.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/webqueue2api/api/resources/queue.py b/src/webqueue2api/api/resources/queue.py
index ccc5fc8..8e94529 100644
--- a/src/webqueue2api/api/resources/queue.py
+++ b/src/webqueue2api/api/resources/queue.py
@@ -1,3 +1,4 @@
+from flask import request
 from flask_restful import Resource
 from flask_jwt_extended import jwt_required
 # To avoid naming conflicts
@@ -7,13 +8,13 @@
 
 
 class Queue(Resource):
-    @jwt_required
+    # @jwt_required
     def get(self, queues: str) -> tuple:
         """Returns the JSON representation of the queue requested.
 
         Return Codes:
                 200 (OK): On success.
-
+                404 (Not Found): When a Queue does not exist.
         Args:
             queues (str): Plus (+) deliminited list of queues.
 
@@ -21,11 +22,12 @@ def get(self, queues: str) -> tuple:
             tuple: Queues as JSON and HTTP response code.
         """
         queues_requested = queues.split("+")
+        headers_only = False if request.args.get("headers_only") == "False" else True
 
         try:
             queue_list = []
             for queue in queues_requested:
-                queue_list.append(_Queue(queue).to_json())
+                queue_list.append(_Queue(queue, headers_only=headers_only).to_json())
             return (queue_list, 200)
         except QueueDoesNotExistError:
             return ({"message": f"Queue {queue} not found."}, 404)
\ No newline at end of file

From 3a87891ed567b47b8893d62a2debe1d2778f57c6 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 11:51:25 -0400
Subject: [PATCH 74/75] Automate generation of json_data in Queue module

---
 src/webqueue2api/parser/queue.py | 35 +++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/webqueue2api/parser/queue.py b/src/webqueue2api/parser/queue.py
index 5276b47..36c22eb 100644
--- a/src/webqueue2api/parser/queue.py
+++ b/src/webqueue2api/parser/queue.py
@@ -32,13 +32,38 @@ def __init__(self, name: str, headers_only: bool = True) -> None:
         if not self.path.exists():
             raise QueueDoesNotExistError(str(self.path))
 
-        self.items = self.get_items(headers_only=headers_only)
+        self.items = self.__get_items(headers_only=headers_only)
+        self.json_data = self.__generate_json_data()
 
-        self.json_data = {
-            "name": self.name,
-        }
+    def __generate_json_data(self) -> dict:
+        """Generates a JSON serializable data dictionary of class attributes.
 
-    def get_items(self, headers_only: bool) -> list:
+        Example:
+                __generate_json_data() returns:
+                ...
+
+        Returns:
+                dict: JSON serializable data dictionary of class attributes.
+        """
+        json_data = {}
+
+        # List of attributes that need processing before being added to json_data
+        attributes_to_process = ["path", "items"]
+        for attribute in attributes_to_process:
+            if attribute == "path":
+                json_data[attribute] = str(self.path)
+            if attribute == "items":
+                json_data[attribute] = [item.to_json() for item in self.items]
+
+        # List of attributes to be ignored
+        attributes_to_ignore = ["to_json"] + attributes_to_process
+        for attribute in self.__dir__():
+            if not attribute.startswith("_") and attribute not in attributes_to_ignore:
+                json_data[attribute] = self.__getattribute__(attribute)
+
+        return json_data
+
+    def __get_items(self, headers_only: bool) -> list:
         """Returns a list of items for this Queue
 
         Args:

From ef7104da38023f863fc00a275f095b4f9d4f04f7 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Mon, 21 Jun 2021 11:52:14 -0400
Subject: [PATCH 75/75] Re-enable authentication

---
 src/webqueue2api/api/resources/queue.py      | 2 +-
 src/webqueue2api/api/resources/queue_list.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/webqueue2api/api/resources/queue.py b/src/webqueue2api/api/resources/queue.py
index 8e94529..f79c041 100644
--- a/src/webqueue2api/api/resources/queue.py
+++ b/src/webqueue2api/api/resources/queue.py
@@ -8,7 +8,7 @@
 
 
 class Queue(Resource):
-    # @jwt_required
+    @jwt_required
     def get(self, queues: str) -> tuple:
         """Returns the JSON representation of the queue requested.
 
diff --git a/src/webqueue2api/api/resources/queue_list.py b/src/webqueue2api/api/resources/queue_list.py
index 8833f52..46b7af2 100644
--- a/src/webqueue2api/api/resources/queue_list.py
+++ b/src/webqueue2api/api/resources/queue_list.py
@@ -4,7 +4,7 @@
 
 
 class QueueList(Resource):
-    # @jwt_required
+    @jwt_required
     def get(self) -> tuple:
         """Returns a list of dictionaries with the number of items in each queue.