Refactored code for better naming

Author: Miguel Yanez

itascraper.py

@@ -58,11 +58,6 @@ def set_return_date(date):
     RETURN_DATE = date
     return date
 
-def search_flights():
-    print "Finding flights...%s to %s...%s / %s" % (ORIGIN, DEST, DEPART_DATE, RETURN_DATE)
-    return build_solutions()
-
-
 def build_solutions():
     """Returns a list of Solutions"""
 
@@ -72,8 +67,10 @@ def build_solutions():
 
     dep_date_obj = datetime.datetime.strptime(DEPART_DATE, '%Y-%m-%d')
     return_date_obj = datetime.datetime.strptime(RETURN_DATE,'%Y-%m-%d')
-    solution_query = SolutionQuery(engine=ENGINE, origin=ORIGIN, destination=DEST, depart_date=dep_date_obj, return_date=return_date_obj)
+    min_price = j['result']['solutionList']['minPrice']
 
+    solution = Solution(engine=ENGINE, origin=ORIGIN, destination=DEST, depart_date=dep_date_obj, return_date=return_date_obj)
+    solution.min_price = min_price
     for sol in j['result']['solutionList']['solutions']:
 
         origin_flight_airline = sol['itinerary']['slices'][0]['flights'][0][:2]
@@ -96,21 +93,8 @@ def build_solutions():
 
         flight_list = [origin_flight, return_flight]
         price = sol['displayTotal']
-        solution = Solution(flights=flight_list, price=price)
-        solution_query.solutions.append(solution)
-
-    solution_query.save()
-    return solution_query
-
-def show_graph(solutions, filename):
-    prices = list()
-    for s in solutions:
-        prices.append(float(s.price[3:]))
-
-    G = GChart('lc', prices, chds='a')
-    G.size(500,500)
-    G.save(filename)
+        itinerary = Itinerary(flights=flight_list, price=price)
+        solution.itineraries.append(itinerary)
 
-if __name__ == '__main__':
-    connectDB()
-    flights = build_solutions()
+    solution.save()
+    return solution

scraper_engine.py

@@ -1,8 +1,9 @@
 import itascraper
-from mongoengine import *
 import datetime
 import urllib
 
+from mongoengine import *
+
 class Flight(EmbeddedDocument):
     airline = StringField()
     fno = IntField()
@@ -22,19 +23,20 @@ def seat_map(self):
         return url
 
 
-class Solution(EmbeddedDocument):
+class Itinerary(EmbeddedDocument):
     flights = ListField(EmbeddedDocumentField(Flight))
     price = StringField()
 
     def set_stop(conn_flight):
         return None
 
 
-class SolutionQuery(Document):
+class Solution(Document):
     query_date = DateTimeField(default=datetime.datetime.utcnow(), required=True)
     engine = StringField(required=True)
     origin = StringField(max_length=100, required=True)
     depart_date = DateTimeField()
     destination = StringField(max_length=100, required=True)
     return_date = DateTimeField()
-    solutions = ListField(EmbeddedDocumentField(Solution))
+    min_price = StringField(required=False)
+    itineraries = ListField(EmbeddedDocumentField(Itinerary))