feat: /new_stock command to search for new arrivals + paginated responses

Jellayy · Jellayy · commit 68eac40a7aaa · 2023-04-25T14:38:11.000-07:00
diff --git a/src/extensions/commands.py b/src/extensions/commands.py
@@ -1,9 +1,16 @@
-from interactions import Extension, slash_command, SlashContext, OptionType, slash_option
-import requests
+from interactions import Extension, slash_command, SlashContext, OptionType, slash_option, Client
+from interactions.ext.paginators import Paginator
+import logging
+import datetime as dt
 import utils.html_parser as html_parser
+import utils.embeds as embeds
+import utils.pullnsave as pullnsave
 
 
 class Commands(Extension):
+    # Extension init
+    def __init__(self, client: Client):
+        self.client = client
 
 
     # User-invoked command to manually search for make
@@ -20,46 +27,94 @@ class Commands(Extension):
         required=False,
         opt_type=OptionType.STRING
     )
-    async def search(self, ctx: SlashContext, make: str, model: str=""):
+    @slash_option(
+        name="year",
+        description="Model year of vehicle to search",
+        required=False,
+        opt_type=OptionType.INTEGER
+    )
+    async def search(self, ctx: SlashContext, make: str, model: str=None, year: int=None):
+        logging.info(f'COMMANDS-SEARCH: Command Invoked! args: {make} {model} {year}')
+        
         # Defer response to give time for request
         await ctx.defer()
 
-        if model == "":
-            model = "0"
+        # Query pullnsave site
+        data = pullnsave.search_vehicles(make, model, year)
+        if not data:
+            logging.error('COMMANDS-SEARCH: pullnsave returned no data, exiting...')
+            await ctx.send('pullnsave returned no data')
+            return
+        
+        # Parse site data
+        all_listings = html_parser.parse_listings(data)
+        if not all_listings:
+            logging.info('COMMANDS-SEARCH: no results, exiting...')
+            await ctx.send('No results found')
+            return
+        
+        # Filter listings
+        filtered_listings = html_parser.filter_listings(all_listings)
 
-        # Make request
-        r = requests.post(
-            url='https://pullnsave.com/wp-admin/admin-ajax.php',
-            headers={
-                'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
-                'host': 'pullnsave.com',
-                'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/112.0'
-            },
-            data=f"makes={make}&models={model}&years=0&store=0&beginDate=&endDate=&action=getVehicles"
-        )
+        # Build embeds
+        listing_embeds = []
+        for listing in filtered_listings:
+            listing_embeds.append(embeds.vehicle_listing(listing))
+        
+        # Send paginated resposne
+        paginator = Paginator.create_from_embeds(self.client, *listing_embeds)
+        await paginator.send(ctx)
+        logging.info('COMMANDS-SEARCH: paginated results sent!')
+    
+
+    # User-invoked command to get new stock
+    @slash_command(name="new_stock", description="Get all latest arrivals")
+    async def new_stock(self, ctx: SlashContext):
+        logging.info('COMMANDS-NEW_STOCK: Command Invoked!')
+
+        # Defer response to give time for requests
+        await ctx.defer()
 
-        if r.status_code == 200:
-            all_listings = html_parser.parse_listings(r.text)
-            if all_listings:
-                filtered_listings = html_parser.filter_listings(all_listings)
-                message = ""
-                for listing in filtered_listings:
-                    message += f"""
-**Model Year:** {listing['model_year']}
-**Model:** {listing['model']}
-**Color:** {listing['color']}
-**Location:** {listing['location']}
-**Row:** {listing['row']}
-**Date Recieved:** {listing['date_recieved'].strftime("%A %B %m %Y")}
-**Image:** {listing['image']}
+        # Query pullnsave for all makes
+        make_data = pullnsave.get_makes()
+        if not make_data:
+            logging.error('COMMANDS-NEW_STOCK: pullnsave returned no data, exiting...')
+            await ctx.send("Couldn't grab make data")
+            return
+        
+        # Parse make data
+        all_makes = html_parser.parse_makes(make_data)
+        if not all_makes:
+            logging.error('COMMANDS-NEW_STOCK: make parse error, exiting...')
+            await ctx.send("Couldn't parse make data")
+            return
+        
+        # Grab all recent listings
+        all_listings = []
+        for make in all_makes:
+            data = pullnsave.search_vehicles(make, begin_date=(dt.datetime.now() - dt.timedelta(days=3)).strftime('%Y-%m-%d'))
+            if not data:
+                logging.error('COMMANDS-NEW_STOCK: pullnsave returned no data, skipping...')
+                continue
+            listings = html_parser.parse_listings(data)
+            if not listings:
+                logging.error('COMMANDS-NEW_STOCK: pullnsave returned no data, skipping...')
+                continue
+            for listing in listings:
+                all_listings.append(listing)
+        
+        # Filter and sort listings
+        filtered_listings = html_parser.filter_listings(all_listings)
 
-                    """
-                await ctx.send(message)
-            else:
-                await ctx.send(f"No listings found for Make: {make} Model: {model}")
-        else:
-            await ctx.send(f"Unhandled request exception: {r.status_code}")
-            
+        # Build embeds
+        listing_embeds = []
+        for listing in filtered_listings:
+            listing_embeds.append(embeds.vehicle_listing(listing))
+        
+        # Send paginated resposne
+        paginator = Paginator.create_from_embeds(self.client, *listing_embeds)
+        await paginator.send(ctx)
+        logging.info('COMMANDS-SEARCH: paginated results sent!')
 
 
 def setup(bot):
diff --git a/src/main.py b/src/main.py
@@ -1,16 +1,30 @@
 import interactions
-from interactions import slash_command, SlashContext
 import os
+import logging
 
 
+# Init Logging
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s [%(levelname)s] %(message)s",
+    handlers=[
+        logging.StreamHandler()
+    ]
+)
+logging.info('MAIN: Logging started!')
+
+# Init Client
 client = interactions.Client()
 
 
+# On Load
 @interactions.listen()
 async def on_startup():
     print('Logged in!')
 
 
+# Load Extensions
 client.load_extension('extensions.commands')
 
+# Start bot
 client.start(os.environ['DISCORD_BOT_TOKEN'])
diff --git a/src/utils/embeds.py b/src/utils/embeds.py
@@ -0,0 +1,46 @@
+from interactions import Embed, EmbedField, EmbedFooter
+
+
+def vehicle_listing(listing_data):
+    embed = Embed(
+        title=f"{listing_data['model_year']} {listing_data['model']}",
+        fields=[
+            EmbedField(
+                name="Color",
+                value=listing_data['color'],
+                inline=True
+            ),
+            EmbedField(
+                name="VIN",
+                value=listing_data['VIN'],
+                inline=True
+            ),
+            EmbedField(
+                name="Stock #",
+                value=listing_data['stock_number'],
+                inline=True
+            ),
+            EmbedField(
+                name="Location",
+                value=listing_data['location'],
+                inline=True
+            ),
+            EmbedField(
+                name="Row",
+                value=listing_data['row'],
+                inline=True
+            ),
+            EmbedField(
+                name="Date Revieved",
+                value=listing_data['date_recieved'].strftime("%A %B %d, %Y"),
+                inline=True
+            )
+        ],
+        footer=EmbedFooter(
+            text="Benz-Finder | Powered by Pull-N-Save",
+            icon_url="https://cdn.discordapp.com/embed/avatars/0.png"
+        )
+    )
+    embed.set_image(listing_data['image'])
+
+    return embed
diff --git a/src/utils/html_parser.py b/src/utils/html_parser.py
@@ -1,5 +1,6 @@
 from bs4 import BeautifulSoup
 import datetime as dt
+import logging
 
 
 def filter_listings(listings):
@@ -9,7 +10,6 @@ def filter_listings(listings):
     return sorted_listings
 
 
-
 def parse_listings(html):
     # Initiate bs4 parser
     soup = BeautifulSoup(html, 'html.parser')
@@ -27,10 +27,31 @@ def parse_listings(html):
                 "date_recieved": dt.datetime.strptime(tr.find_all('td')[3].get_text().strip(), "%m-%d-%y"),
                 "row": tr.find_all('td')[4].get_text().strip(),
                 "location": tr.find_all('td')[5].get_text().strip(),
-                "color": tr.find_all('td')[6].get_text().strip()
+                "color": tr.find_all('td')[6].get_text().strip(),
+                "stock_number": tr.find_all('td')[7].get_text().strip(),
+                "VIN": tr.find_all('td')[8].get_text().strip()
             })
         
         return listings
     except Exception as e:
-        print('PARSING ERROR: {e}')
+        logging.error(f'HTML_PARSER-PARSE_LISTINGS: Parsing Error: {e}')
+        return False
+
+
+def parse_makes(html):
+    # Initiate bs4 parser
+    soup = BeautifulSoup(html, 'html.parser')
+
+    try:
+        # Find all span elements with the class 'notranslate'
+        spans = soup.find_all('span', {'class': 'notranslate'})
+
+        # Extract span text
+        makes = []
+        for span in spans:
+            makes.append(span.text)
+        
+        return makes
+    except Exception as e:
+        logging.error(f'HTML_PARSER-PARSE_MAKES: Parsing Error: {e}')
         return False
diff --git a/src/utils/pullnsave.py b/src/utils/pullnsave.py
@@ -0,0 +1,61 @@
+import requests
+import logging
+
+
+def search_vehicles(make, model=None, year=None, store=None, begin_date=None, end_date=None):
+    # Build request body
+    data = f'makes={make}'
+    if model:
+        data += f'&models={model}'
+    if year:
+        data += f'&years={year}'
+    if store:
+        data += f'&store={store}'
+    if begin_date:
+        data += f'&beginDate={begin_date}'
+    if end_date:
+        data += f'&endDate={end_date}'
+    data += '&action=getVehicles'
+
+    # Send request
+    logging.info(f'PULLNSAVE: Sending Request: {data}')
+    r = requests.post(
+        url='https://pullnsave.com/wp-admin/admin-ajax.php',
+        headers={
+            'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+            'host': 'pullnsave.com',
+            'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/112.0'
+        },
+        data=data
+    )
+
+    # Return response
+    if r.status_code == 200:
+        return r.text
+    else:
+        logging.error(f'PULLNSAVE: Unhandled Response Status: {r.status_code}')
+        return False
+
+
+def get_makes():
+    # Build request body
+    data = 'action=getMakes'
+
+    # Send request
+    logging.info(f'PULLNSAVE: Sending Request: {data}')
+    r = requests.post(
+        url='https://pullnsave.com/wp-admin/admin-ajax.php',
+        headers={
+            'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+            'host': 'pullnsave.com',
+            'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/112.0'
+        },
+        data=data
+    )
+
+    # Return response
+    if r.status_code == 200:
+        return r.text
+    else:
+        logging.error(f'PULLNSAVE: Unhandled Response Status: {r.status_code}')
+        return False
