Merge pull request #278 from bcgov/release-v0.1.0

Release v0.1.0.5
bcgov · May 8, 2018 · a25ad5d · a25ad5d
2 parents a18e5e3 + 3e6065a
commit a25ad5d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/backend/api/services/CreditTradeService.py b/backend/api/services/CreditTradeService.py
@@ -27,18 +27,26 @@ def get_organization_credit_trades(organization):
                                                .get(status="Accepted")
             status_cancelled = CreditTradeStatus.objects \
                                                 .get(status="Cancelled")
+
             credit_trades = CreditTrade.objects.filter(
-                Q(initiator=organization) |
-                (Q(status__id__gte=status_accepted.id) &
-                 ~Q(status__id=status_cancelled.id)))
+                ~Q(status__id=status_cancelled.id) &
+                (Q(initiator=organization) |
+                 Q(status__id__gte=status_accepted.id))
+                )
         else:
             # Fuel suppliers
             status_submitted = CreditTradeStatus.objects \
                                                 .get(status="Submitted")
+            status_cancelled = CreditTradeStatus.objects \
+                                                .get(status="Cancelled")
+
             credit_trades = CreditTrade.objects.filter(
-                Q(initiator=organization) |
-                (Q(respondent=organization) &
-                 Q(status__id__gte=status_submitted.id)))
+                ~Q(status__id=status_cancelled.id) &
+                (Q(initiator=organization) |
+                 (Q(respondent=organization) &
+                  Q(status__id__gte=status_submitted.id))
+                 )
+                )
 
         return credit_trades
 

diff --git a/backend/api/test_api.py b/backend/api/test_api.py
@@ -212,8 +212,7 @@ def test_is_internal_history_draft_then_cancelled(self):
             "{}/{}/history".format(self.test_url, self.credit_trade['id']),
             content_type='application/json')
 
-        response_data = json.loads(response.content.decode("utf-8"))
-        self.assertTrue(response_data[0]['isInternalHistoryRecord'])
+        self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code)
 
     def test_nested_credit_trade(self):
         response = self.client.get(