cs-models 0.0.753__py3-none-any.whl → 0.0.754__py3-none-any.whl

cs_models/resources/FDADrugReview/models.py

@@ -3,9 +3,6 @@ from sqlalchemy import (
     Integer,
     String,
     DateTime,
-    ForeignKey,
-    Boolean,
-    Float,
 )
 from datetime import datetime
 
@@ -16,19 +13,12 @@ class FDADrugReviewModel(Base):
     __tablename__ = 'fda_drug_reviews'
 
     id = Column(Integer, primary_key=True)
-    file_id = Column(
-        Integer,
-        ForeignKey('files.id'),
-        nullable=False,
-    )
-    date = Column(DateTime, nullable=True)
-    title = Column(String(255), nullable=True)
-    page_count = Column(Integer, nullable=True)
-    type = Column(String(255), nullable=True)
-    orig_file_url = Column(String(255), nullable=True)
-    is_deleted = Column(Boolean, nullable=True)
-    unprocessed = Column(Boolean, nullable=True)
-    reviewed = Column(Boolean, nullable=True)
+    application_docs_id = Column(String(128), nullable=False)
+    appl_no = Column(String(50), nullable=False)
+    submission_type = Column(String(50), nullable=True)
+    submission_no = Column(String(50), nullable=True)
+    application_doc_url = Column(String(255), nullable=True)
+    application_doc_date = Column(DateTime, nullable=True)
     updated_at = Column(
         DateTime,
         nullable=False,

cs_models/resources/FDADrugReview/schemas.py

@@ -9,13 +9,10 @@ class FDADrugReviewResourceSchema(Schema):
     not_blank = validate.Length(min=1, error='Field cannot be blank')
 
     id = fields.Integer(dump_only=True)
-    file_id = fields.Integer(required=True)
-    date = fields.DateTime(allow_none=True)
-    title = fields.String(allow_none=True)
-    page_count = fields.Integer(allow_none=True)
-    type = fields.String(allow_none=True)
-    orig_file_url = fields.String(allow_none=True)
-    is_deleted = fields.Boolean(allow_none=True)
-    unprocessed = fields.Boolean(allow_none=True)
-    reviewed = fields.Boolean(allow_none=True)
+    application_docs_id = fields.String(required=True)
+    appl_no = fields.String(required=True)
+    submission_type = fields.String(allow_none=True)
+    submission_no = fields.String(allow_none=True)
+    application_doc_url = fields.String(allow_none=True)
+    application_doc_date = fields.DateTime(allow_none=True)
     updated_at = fields.DateTime(dump_only=True)

cs_models/resources/FDADrugReviewFile/models.py

@@ -0,0 +1,43 @@
+from sqlalchemy import (
+    Column,
+    Integer,
+    String,
+    DateTime,
+    ForeignKey,
+    Boolean,
+    Float,
+)
+from datetime import datetime
+
+from ...database import Base
+
+
+class FDADrugReviewFileModel(Base):
+    __tablename__ = 'fda_drug_reviews_files'
+
+    id = Column(Integer, primary_key=True)
+    fda_drug_review_id = Column(
+        Integer,
+        ForeignKey('fda_drug_reviews.id'),
+        nullable=False,
+    )
+    file_id = Column(
+        Integer,
+        ForeignKey('files.id'),
+        nullable=False,
+    )
+    date = Column(DateTime, nullable=True)
+    title = Column(String(255), nullable=True)
+    page_count = Column(Integer, nullable=True)
+    type = Column(String(255), nullable=True)
+    orig_file_url = Column(String(255), nullable=True)
+    is_deleted = Column(Boolean, nullable=True)
+    unprocessed = Column(Boolean, nullable=True)
+    reviewed = Column(Boolean, nullable=True)
+    updated_at = Column(
+        DateTime,
+        nullable=False,
+        # https://stackoverflow.com/questions/58776476/why-doesnt-freezegun-work-with-sqlalchemy-default-values
+        default=lambda: datetime.utcnow(),
+        onupdate=lambda: datetime.utcnow(),
+    )

cs_models/resources/FDADrugReviewFile/schemas.py

@@ -0,0 +1,22 @@
+from marshmallow import (
+    Schema,
+    fields,
+    validate,
+)
+
+
+class FDADrugReviewFileResourceSchema(Schema):
+    not_blank = validate.Length(min=1, error='Field cannot be blank')
+
+    id = fields.Integer(dump_only=True)
+    fda_drug_review_id = fields.Integer(required=True)
+    file_id = fields.Integer(required=True)
+    date = fields.DateTime(allow_none=True)
+    title = fields.String(allow_none=True)
+    page_count = fields.Integer(allow_none=True)
+    type = fields.String(allow_none=True)
+    orig_file_url = fields.String(allow_none=True)
+    is_deleted = fields.Boolean(allow_none=True)
+    unprocessed = fields.Boolean(allow_none=True)
+    reviewed = fields.Boolean(allow_none=True)
+    updated_at = fields.DateTime(dump_only=True)

{cs_models-0.0.753.dist-info → cs_models-0.0.754.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cs-models
-Version: 0.0.753
+Version: 0.0.754
 Summary: MySQL db models
 Home-page: https://github.com/mindgram/cs-models
 Author: Shrey Verma

{cs_models-0.0.753.dist-info → cs_models-0.0.754.dist-info}/RECORD

@@ -317,8 +317,11 @@ cs_models/resources/ExplorerColumn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 cs_models/resources/ExplorerColumn/models.py,sha256=t448jSUDUNpN3MPlA1-nf2H-K9KVfMkKIV7ruB-DSks,799
 cs_models/resources/ExplorerColumn/schemas.py,sha256=0qsNjOCkilZNa_Ly083dzp43h72MrAFM39dp2s8CnmY,442
 cs_models/resources/FDADrugReview/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/FDADrugReview/models.py,sha256=zs3nLJgd9aoO2I8H03pyqEmu5LVB3lWpLfLuj30G9z4,1050
-cs_models/resources/FDADrugReview/schemas.py,sha256=--onPQRRaxDKZgrh42KADLpyjCf5gc06BE1VbUOKnZw,690
+cs_models/resources/FDADrugReview/models.py,sha256=Z1tXPTamqCDQbV5ZOItX26XP0UeQGXlgAqOsK0wuy3w,868
+cs_models/resources/FDADrugReview/schemas.py,sha256=5jh7p0XhbI-yqCJ4t-4DdQ21R7vRmdEpvAo6IhRyLsU,590
+cs_models/resources/FDADrugReviewFile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cs_models/resources/FDADrugReviewFile/models.py,sha256=ZLFnNx58Uv4YVs42jX8kHlBvjj87FcCrhCOb_7Wa9cw,1183
+cs_models/resources/FDADrugReviewFile/schemas.py,sha256=q2IxAoRjcPa70eKV-MvLbdZsHBOsLR_YWogDMC-3KjY,749
 cs_models/resources/FDALabel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/FDALabel/models.py,sha256=9J7Erh0fr6OrpQNBgyx83qdWxAuKg9NUbMLzG3EBWvI,1234
 cs_models/resources/FDALabel/schemas.py,sha256=J6_J2PkZInLxay5Bvq6TuHuJdii4TRoLhIE4RBT8FeY,793
@@ -1231,7 +1234,7 @@ cs_models/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/utils/alchemy.py,sha256=fhINGFn41owJ2DLXQKXAAtLqeZ1BRzD_qU0wPK_bsGQ,1598
 cs_models/utils/utils.py,sha256=bY623DuzycfPQiaOQT2AxfANeWfwr5w76dBuQ813-ns,3664
 cs_models/utils/profiling/__init__.py,sha256=N-73vb0M92C975fxgXyBCBjCPELl8Oh21ZY_-tzDnns,569
-cs_models-0.0.753.dist-info/METADATA,sha256=I21ZsKITt5nyUXtE4rTloove8Mrl3X8jhOu8uOrAUjI,751
-cs_models-0.0.753.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cs_models-0.0.753.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
-cs_models-0.0.753.dist-info/RECORD,,
+cs_models-0.0.754.dist-info/METADATA,sha256=78wFOQEsa8b9cSt4GkTNvVfJ7iwacOQka3ziH3xnnww,751
+cs_models-0.0.754.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cs_models-0.0.754.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
+cs_models-0.0.754.dist-info/RECORD,,