diff --git a/.coverage b/.coverage index ffdf25c..980b4b4 100644 --- a/.coverage +++ b/.coverage @@ -1 +1 @@ -!coverage.py: This is a private format, don't read it directly!{"lines":{"/home/wisemillionare/Documents/apisendIT/app/__init__.py":[1,3,5,8,10,11,12,14],"/home/wisemillionare/Documents/apisendIT/app/api/__init__.py":[1],"/home/wisemillionare/Documents/apisendIT/app/api/v1/__init__.py":[1,3,4,5,6,8,10,14,15,16,17,18,19,20,21,22,23,24,25,26],"/home/wisemillionare/Documents/apisendIT/app/api/v1/views/__init__.py":[1],"/home/wisemillionare/Documents/apisendIT/app/api/v1/views/orders_view.py":[1,3,4,5,8,9,11,14,20,30,31,33,36,42,52,53,55,58,65,66,68,71,56,60,62,12,22,24,25,27,69,73,74,76,34,44,46,47,49,16,18,38,40],"/home/wisemillionare/Documents/apisendIT/app/api/v1/models/__init__.py":[1],"/home/wisemillionare/Documents/apisendIT/app/api/v1/models/orders_model.py":[1,3,4,5,8,9,11,15,38,50,61,74,86,98,113,120,12,13,76,78,84,17,19,22,23,24,25,26,27,28,29,30,31,34,36,88,90,91,92,93,94,96,63,65,66,67,68,69,70,72,40,42,43,44,45,46,48,115,116,118,100,102,103,104,105,106,107,108,109,111,122,123,125,52,54,55,56,57,59],"/home/wisemillionare/Documents/apisendIT/app/api/v1/models/users_model.py":[1,2,5,6,8,11,29,33,9,14,15,16,17,18,19,20,21,22,25,27,31,35,36],"/home/wisemillionare/Documents/apisendIT/app/api/v1/views/users_view.py":[1,3,4,5,6,8,9,11,14,24,25,27,31,39,40,42,46,54,55,57,61,12,16,18,19,21,43,44,48,49,51,28,29,33,34,36,58,59,63,64,66],"/home/wisemillionare/Documents/apisendIT/app/tests/__init__.py":[1],"/home/wisemillionare/Documents/apisendIT/app/tests/test_views.py":[1,2,3,4,7,8,10,41,50,59,68,77,87,96,106,117,126,136,12,13,15,16,17,18,19,20,21,22,23,27,28,29,30,31,32,36,37,38,89,90,91,93,94,108,52,53,54,56,57,110,111,112,114,115,43,44,45,47,48,98,99,100,102,103,61,62,63,65,66,119,120,121,123,124,79,80,81,82,84,85,128,129,130,132,133,70,71,72,74,75],"/home/wisemillionare/Documents/apisendIT/app/config.py":[1,3,4,5]}} \ No newline at end of file +!coverage.py: This is a private format, don't read it directly!{"lines":{"/home/wisemillionare/Documents/apisendIT/app/__init__.py":[1,3,5,8,10,11,12,14],"/home/wisemillionare/Documents/apisendIT/app/api/__init__.py":[1],"/home/wisemillionare/Documents/apisendIT/app/api/v1/__init__.py":[1,3,4,5,6,8,10,14,15,16,17,18,19,20,21,22,23,24,25,26],"/home/wisemillionare/Documents/apisendIT/app/api/v1/views/__init__.py":[1],"/home/wisemillionare/Documents/apisendIT/app/api/v1/views/orders_view.py":[1,3,4,5,8,9,11,14,20,34,35,37,40,46,60,61,63,66,73,74,76,79,64,68,70,12,22,23,24,25,28,29,31,77,81,82,83,84,87,89,38,48,49,50,51,54,55,57,16,18,42,44],"/home/wisemillionare/Documents/apisendIT/app/api/v1/models/__init__.py":[1],"/home/wisemillionare/Documents/apisendIT/app/api/v1/models/orders_model.py":[1,2,3,4,5,8,9,11,15,38,50,61,74,86,98,113,120,128,129,131,135,150,174,196,210,12,13,76,78,84,132,133,137,138,139,141,142,176,177,179,181,183,185,187,190,194,148,17,19,22,23,24,25,26,27,28,29,30,31,34,36,143,146,212,213,215,218,222,88,90,91,92,93,94,96,140,152,153,155,157,159,161,163,165,168,172,144,198,199,201,204,208,63,65,66,67,68,69,70,72,40,42,43,44,45,46,48,115,116,118,100,102,103,104,105,106,107,108,109,111,122,123,125,52,54,55,56,57,59],"/home/wisemillionare/Documents/apisendIT/app/api/v1/models/users_model.py":[1,2,5,6,8,11,29,33,9,14,15,16,17,18,19,20,21,22,25,27,31,35,36],"/home/wisemillionare/Documents/apisendIT/app/api/v1/views/users_view.py":[1,3,4,5,6,8,9,11,14,28,29,31,35,43,44,46,50,58,59,61,65,12,16,17,18,19,22,23,25,47,48,52,53,55,32,33,37,38,40,62,63,67,68,70],"/home/wisemillionare/Documents/apisendIT/app/tests/__init__.py":[1],"/home/wisemillionare/Documents/apisendIT/app/tests/test_views.py":[1,2,3,4,7,8,10,41,50,59,68,77,87,96,106,117,126,136,12,13,15,16,17,18,19,20,21,22,23,27,28,29,30,31,32,36,37,38,89,90,91,93,94,108,52,53,54,56,57,110,111,112,114,115,43,44,45,47,48,98,99,100,102,103,61,62,63,65,66,119,120,121,123,124,79,80,81,82,84,85,128,129,130,132,133,70,71,72,74,75],"/home/wisemillionare/Documents/apisendIT/app/config.py":[1,3,4,5]}} \ No newline at end of file diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 0000000..52a3b45 --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1 @@ +repo_token: 10LA16nFydZVf186lELkzf4O2MHsg2MDc \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 0b1efc8..f34e11a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ install: - pip install -r requirements.txt script: - - pytestpytest --cov-report term-missing --cov=app + - pytest --cov-report term-missing --cov=app after_success: - coveralls \ No newline at end of file diff --git a/app/api/v1/models/orders_model.py b/app/api/v1/models/orders_model.py index 2a8cfde..430db78 100644 --- a/app/api/v1/models/orders_model.py +++ b/app/api/v1/models/orders_model.py @@ -173,7 +173,7 @@ def create_user_inputs(self): def create_order_inputs(self): """confirm inputs for creating order""" - if 'username' in self.user_input and 'order no' in self.user_input and 'pick up location' in self.user_input and 'delivery location' in self.user_input and 'weight' in self.user_input and 'price' in self.user_input and 'sender' in self.user_input: + if 'order no' in self.user_input and 'pick up location' in self.user_input and 'delivery location' in self.user_input and 'weight' in self.user_input and 'price' in self.user_input and 'sender' in self.user_input: if not self.user_input['order no']: message = "order no missing" elif not self.user_input['pick up location']: