Removed investment.duration

market/community/market/conversion.proto

@@ -98,12 +98,11 @@ message Investment {
     required uint32 id = 1;
     required bytes user_id = 2;
     required double amount = 3;
-    required uint32 duration = 4;
-    required double interest_rate = 5;
-    required uint32 campaign_id = 6;
-    required bytes campaign_user_id = 7;
-    required uint32 status = 8;
-    optional bytes contract_id = 9;
+    required double interest_rate = 4;
+    required uint32 campaign_id = 5;
+    required bytes campaign_user_id = 6;
+    required uint32 status = 7;
+    optional bytes contract_id = 8;
 }
 
 message Transfer {

market/database/schema.sql

@@ -80,7 +80,6 @@ CREATE TABLE IF NOT EXISTS investment(
   user_id          TEXT,
   owner_id         TEXT,
   amount           FLOAT,
-  duration         INTEGER,
   interest_rate    FLOAT,
   campaign_id      INTEGER,
   campaign_user_id TEXT,

market/models/investment.py

@@ -29,19 +29,17 @@ class Investment(object):
     user_id = RawStr()
     owner_id = RawStr()
     amount = Float()
-    duration = Int()
     interest_rate = Float()
     campaign_id = Int()
     campaign_user_id = RawStr()
     status = Enum(InvestmentStatus)
     contract_id = RawStr()
     transfers = ReferenceSet((id, user_id), (Transfer.investment_id, Transfer.investment_user_id))
 
-    def __init__(self, identifier, user_id, amount, duration, interest_rate, campaign_id, campaign_user_id, status, contract_id=''):
+    def __init__(self, identifier, user_id, amount, interest_rate, campaign_id, campaign_user_id, status, contract_id=''):
         self.id = identifier
         self.user_id = user_id
         self.amount = amount
-        self.duration = duration
         self.interest_rate = interest_rate
         self.campaign_id = campaign_id
         self.campaign_user_id = campaign_user_id
@@ -53,7 +51,6 @@ def to_dict(self, api_response=False):
             'id': self.id,
             'user_id': urlsafe_b64encode(self.user_id) if api_response else self.user_id,
             'amount': self.amount,
-            'duration': self.duration,
             'interest_rate': self.interest_rate,
             'campaign_id': self.campaign_id,
             'campaign_user_id': urlsafe_b64encode(self.campaign_user_id) if api_response else self.campaign_user_id,
@@ -71,7 +68,6 @@ def from_dict(investment_dict):
         return Investment(investment_dict['id'],
                           investment_dict['user_id'],
                           investment_dict['amount'],
-                          investment_dict['duration'],
                           investment_dict['interest_rate'],
                           investment_dict['campaign_id'],
                           investment_dict['campaign_user_id'],

market/restapi/you_endpoint.py

@@ -230,8 +230,8 @@ def render_PUT(self, request):
             return json.dumps({"error": "mortgage not found"})
 
         counter = self.community.data_manager.store.find(Investment, Investment.user_id == you.id).count()
-        investment = Investment(counter, you.id, amount, 0,
-                                interest_rate, campaign.id, campaign.user_id, InvestmentStatus.PENDING)
+        investment = Investment(counter, you.id, amount, interest_rate,
+                                campaign.id, campaign.user_id, InvestmentStatus.PENDING)
         you.investments.add(investment)
         campaign.investments.add(investment)
 

market/test/test_market.py

@@ -362,7 +362,6 @@ def create_investment(self, community, user_id, campaign, status=InvestmentStatu
         investment = Investment(user.investments.count(),
                                 user.id,
                                 10000,
-                                0,
                                 0.02,
                                 campaign.id,
                                 campaign.user_id,