Merge pull request #514 from CodeForPhilly/add_days_validation

Update validators in model

Author: jlubken

setup.py

@@ -3,8 +3,7 @@
 __version__ = "1.1.3"  # update VERSION in constants.py
 __author__ = "Predictive Healthcare @ Penn Medicine"
 
-from os import path
-from setuptools import setup, find_packages, find_namespace_packages
+from setuptools import setup, find_namespace_packages
 
 
 setup(
@@ -24,6 +23,7 @@
     install_requires=[
         "altair",
         "black",
+        "gspread",
         "gunicorn",
         "dash",
         "dash_bootstrap_components",
@@ -42,10 +42,9 @@
         "Operating System :: OS Independent",
     ],
     python_requires='>=3.7',
-    entry_points = {
+    entry_points={
         'console_scripts': ['penn_chime=penn_chime.cli:main'],
     },
     keywords=[],
     include_package_data=True,
 )
-

src/penn_chime/parameters.py

@@ -19,6 +19,7 @@
 )
 from .validators import (
     Date,
+    GteOne,
     OptionalDate,
     OptionalValue,
     OptionalStrictlyPositive,
@@ -64,7 +65,7 @@ class Disposition(_Disposition):
     @classmethod
     def create(cls, *, days: int, rate: float):
         """Mandate key word arguments."""
-        Positive(key="days", value=days)
+        GteOne(key="days", value=days)
         Rate(key="rate", value=rate)
         return cls(days, rate)
 
@@ -201,7 +202,7 @@ def validate(string):
     (
         "hospitalized_days",
         int,
-        0,
+        1,
         None,
         True,
     ),
@@ -215,7 +216,7 @@ def validate(string):
     (
         "icu_days",
         int,
-        0,
+        1,
         None,
         True,
     ),
@@ -285,7 +286,7 @@ def validate(string):
     (
         "ventilated_days",
         int,
-        0,
+        1,
         None,
         True,
     ),

src/penn_chime/validators/__init__.py

@@ -15,6 +15,7 @@
 OptionalStrictlyPositive = ValOptionalBounded(lower_bound=EPSILON)
 StrictlyPositive = ValBounded(lower_bound=EPSILON)
 Positive = ValBounded(lower_bound=-EPSILON)
+GteOne = ValBounded(lower_bound=1)
 Rate = ValRate()
 Date = ValDate()
 OptionalDate = ValOptionalDate()