Add contract_type to api returns

Author: cpacia

api/restapi.py

@@ -238,6 +238,8 @@ def parse_listings(listings):
                         "origin": str(CountryCode.Name(l.origin)),
                         "ships_to": []
                     }
+                    if l.contract_type != 0:
+                        listing_json["contract_type"] = str(objects.Listings.ContractType.Name(l.contract_type))
                     for country in l.ships_to:
                         listing_json["ships_to"].append(str(CountryCode.Name(country)))
                     response["listings"].append(listing_json)

api/ws.py

@@ -181,6 +181,8 @@ def handle_response(listings, node):
                                         "ships_to": []
                                     }
                             }
+                            if l.contract_type != 0:
+                                listing_json["contract_type"] = str(Listings.ContractType.Name(l.contract_type))
                             for country in l.ships_to:
                                 listing_json["listing"]["ships_to"].append(str(CountryCode.Name(country)))
                             if not os.path.isfile(os.path.join( \

market/contracts.py

@@ -998,6 +998,12 @@ def save(self):
                 self.contract["vendor_offer"]["listing"]["shipping"]["shipping_origin"].upper())
             for region in self.contract["vendor_offer"]["listing"]["shipping"]["shipping_regions"]:
                 data.ships_to.append(CountryCode.Value(region.upper()))
+        if self.contract["vendor_offer"]["listing"]["metadata"]["category"].lower() == "physical good":
+            data.contract_type = listings.PHYSICAL_GOOD
+        elif self.contract["vendor_offer"]["listing"]["metadata"]["category"].lower() == "digital good":
+            data.contract_type = listings.DIGITAL_GOOD
+        elif self.contract["vendor_offer"]["listing"]["metadata"]["category"].lower() == "service":
+            data.contract_type = listings.SERVICE
 
         # save the mapping of the contract file path and contract hash in the database
         self.db.filemap.insert(data.contract_hash.encode("hex"), file_path[len(DATA_FOLDER):])

protos/objects.proto

@@ -120,6 +120,14 @@ message Listings {
         repeated CountryCode ships_to = 9;
         bytes avatar_hash             = 10;
         string handle                 = 11;
+        ContractType contract_type    = 12;
+    }
+
+    enum ContractType {
+        NOT_SET       = 0;
+        PHYSICAL_GOOD = 1;
+        DIGITAL_GOOD  = 2;
+        SERVICE       = 3;
     }
 }