From 3eae54fd358aed8fca0d1c21644d589b8ac3bfc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Thu, 24 Oct 2024 15:58:38 +0200
Subject: [PATCH] FIX: better debug output and some fixes
---
loanpy/integrationtests/basic_test.py | 6 +++---
loanpy/src/loan/accept_loan_request.py | 2 +-
loanpy/src/loan/accept_return_request.py | 2 +-
loanpy/src/loan/request_return.py | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/loanpy/integrationtests/basic_test.py b/loanpy/integrationtests/basic_test.py
index 5fda6aa..5608091 100644
--- a/loanpy/integrationtests/basic_test.py
+++ b/loanpy/integrationtests/basic_test.py
@@ -117,7 +117,7 @@ def test_request_loan():
#option1="val1",
files={"-p0": save_dict_to_jsonfile(data)},
**{"auth-token":db.get_connection()._authenticator.auth_token})
- assert response.stderr is None
+ assert response.stderr is None, response.stderr
assert response.code == 0
loan = db.execute_query(f"FIND loan with {COMMENT.name}='{TESTLOANCOMMENT}'", unique=True)
assert loan.get_property(f"{LOAN_ACCEPTED.name}").value.startswith("20")
@@ -153,7 +153,7 @@ def test_request_loan():
#option1="val1",
files={"-p0": save_dict_to_jsonfile(data)},
**{"auth-token":db.get_connection()._authenticator.auth_token})
- assert response.stderr is None
+ assert response.stderr is None, response.stderr
assert response.code == 0
loan = db.execute_query(f"FIND loan with {COMMENT.name}='{TESTLOANCOMMENT}'", unique=True)
assert loan.get_property(f"{LOAN_ACCEPTED.name}").value.startswith("20")
@@ -172,7 +172,7 @@ def test_request_loan():
#option1="val1",
files={"-p0": save_dict_to_jsonfile(data)},
**{"auth-token":db.get_connection()._authenticator.auth_token})
- assert response.stderr is None
+ assert response.stderr is None, response.stderr
assert response.code == 0
loan = db.execute_query(f"FIND loan with {COMMENT.name}='{TESTLOANCOMMENT}'", unique=True)
assert loan.get_property(f"{RETURN_ACCEPTED.name}").value.startswith("20")
diff --git a/loanpy/src/loan/accept_loan_request.py b/loanpy/src/loan/accept_loan_request.py
index ca89c7c..b1f521a 100755
--- a/loanpy/src/loan/accept_loan_request.py
+++ b/loanpy/src/loan/accept_loan_request.py
@@ -31,7 +31,7 @@ from .box_loan import (main, get_loan, F_LOAN,update_loan_state,
def _accept_loan_request(loan):
"""Update a loan Record: add the `accepted` Property."""
# This changes the state from "loan_requested" to "loan_accepted".
- update_loan_state(loan, LOAN_ACCEPTED)
+ update_loan_state(loan, S_LOAN_ACCEPTED)
db.Container().extend([loan]).update()
diff --git a/loanpy/src/loan/accept_return_request.py b/loanpy/src/loan/accept_return_request.py
index 045f967..5a2ea7a 100755
--- a/loanpy/src/loan/accept_return_request.py
+++ b/loanpy/src/loan/accept_return_request.py
@@ -33,7 +33,7 @@ from .box_loan import (BOX_BORROWED, CONTENT, main, get_loan, set_property,
def _accept_return_request(loan):
"""Update a loan Record and add the `accepted` Property."""
# This changes the state from "return_requested" to "return_accepted".
- update_loan_state(loan, RETURN_ACCEPTED)
+ update_loan_state(loan, S_RETURN_ACCEPTED)
items = set_location_of_borrowed_items(loan, RETURNLOCATION)
if loan.get_property(CONTENT) is not None and loan.get_property(CONTENT).value:
diff --git a/loanpy/src/loan/request_return.py b/loanpy/src/loan/request_return.py
index 347e613..8cd8516 100755
--- a/loanpy/src/loan/request_return.py
+++ b/loanpy/src/loan/request_return.py
@@ -31,7 +31,7 @@ from caosadvancedtools.serverside.helper import get_timestamp, print_success
from .box_loan import (BORROWER, COMMENT, CONTENT, EXPECTED_RETURN, F_COMMENT,
F_CURRENT_LOCATION, F_EMAIL, F_EXPECTED_RETURN_DATE,
F_FIRST_NAME, F_LAST_NAME, F_LOAN, FIRST_NAME, LAST_NAME,update_loan_state,
- RETURN_REQUESTED, RETURNLOCATION, S_LENT,
+ RETURN_REQUESTED, RETURNLOCATION, S_LENT, S_RETURN_REQUESTED,
assert_date_in_future, assert_key_in_data,
get_loan, insert_or_update_person, main,
send_return_request_mail, set_property)
--
GitLab