Merge pull request #208 from DataIntegrationGroup/transfer

Transfer

Author: jirhiker

api/thing.py

@@ -32,8 +32,9 @@
     editor_dependency,
     viewer_dependency,
 )
-from db.thing import Thing, ThingIdLink, WellScreen
 from db.deployment import Deployment
+from db.thing import Thing, ThingIdLink, WellScreen
+from schemas.deployment import DeploymentResponse
 from schemas.thing import (
     CreateThingIdLink,
     CreateWell,
@@ -49,9 +50,9 @@
     UpdateThingIdLink,
     UpdateWellScreen,
 )
-from schemas.deployment import DeploymentResponse
 from services.crud_helper import model_patcher, model_adder, model_deleter
 from services.exceptions_helper import PydanticStyleException
+from services.lexicon_helper import get_terms_by_category
 from services.query_helper import (
     simple_get_by_id,
     paginated_all_getter,
@@ -66,7 +67,6 @@
     modify_well_descriptor_tables,
     WELL_DESCRIPTOR_MODEL_MAP,
 )
-from services.lexicon_helper import get_terms_by_category
 
 router = APIRouter(prefix="/thing", tags=["thing"])
 

core/initializers.py

@@ -17,6 +17,7 @@
 
 from sqlalchemy import text
 from sqlalchemy.exc import DatabaseError
+from sqlalchemy.orm import Session
 
 from db import Base
 from db.engine import engine, session_ctx
@@ -81,6 +82,19 @@ def init_parameter(path: str = None) -> None:
                 session.rollback()
 
 
+def erase_and_rebuild_db(session: Session):
+    from sqlalchemy import text
+
+    with session.bind.connect() as conn:
+        conn.execute(text("DROP SCHEMA public CASCADE"))
+        conn.execute(text("CREATE SCHEMA public"))
+        conn.execute(text("CREATE EXTENSION IF NOT EXISTS postgis"))
+        conn.commit()
+
+    Base.metadata.drop_all(session.bind)
+    Base.metadata.create_all(session.bind)
+
+
 def init_lexicon(path: str = None) -> None:
     if path is None:
         path = Path(__file__).parent / "lexicon.json"

db/contact.py

@@ -13,15 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ===============================================================================
+from typing import List, TYPE_CHECKING
+
 from sqlalchemy import Integer, ForeignKey, String
 from sqlalchemy.ext.associationproxy import association_proxy, AssociationProxy
 from sqlalchemy.orm import relationship, Mapped, mapped_column
 from sqlalchemy_utils import TSVectorType
-from typing import List, TYPE_CHECKING
 
 from db.base import Base, AutoBaseMixin, ReleaseMixin, lexicon_term
 
-
 if TYPE_CHECKING:
     from db.field import FieldEventParticipant, FieldEvent
     from db.thing import Thing
@@ -118,7 +118,8 @@ class Phone(Base, AutoBaseMixin, ReleaseMixin):
     contact_id: Mapped[int] = mapped_column(
         ForeignKey("contact.id", ondelete="CASCADE"), nullable=False
     )
-    phone_number: Mapped[str] = mapped_column(String(20), nullable=False)
+    nma_phone_number: Mapped[str] = mapped_column(String(20), nullable=True)
+    phone_number: Mapped[str] = mapped_column(String(20), nullable=True)
     phone_type: Mapped[str] = lexicon_term(nullable=False)
 
     contact: Mapped["Contact"] = relationship(

db/geochronology.py

@@ -13,10 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ===============================================================================
-from db.base import AutoBaseMixin, Base, lexicon_term
 from sqlalchemy import Integer, Float
 from sqlalchemy.orm import mapped_column
 
+from db.base import AutoBaseMixin, Base, lexicon_term
+
 
 class GeochronologyAge(Base, AutoBaseMixin):
     location_id = mapped_column(Integer, nullable=False)

schemas/__init__.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 # ===============================================================================
 from datetime import datetime, timezone
+
 from pydantic import BaseModel, ConfigDict, AwareDatetime
 from pydantic.json_schema import JsonSchemaValue
 from pydantic_core import core_schema

schemas/contact.py

@@ -67,15 +67,26 @@ def validate_phone(cls, phone_number_str: str | None) -> str | None:
             region = "US"
             try:
                 phone_number_str = phone_number_str.strip()
+                parsed_number = phonenumbers.parse(phone_number_str, region)
+                if phonenumbers.is_valid_number(parsed_number):
+                    formatted_number = phonenumbers.format_number(
+                        parsed_number, phonenumbers.PhoneNumberFormat.E164
+                    )
+                    return formatted_number
+
                 # this is a major hack to deal with the phone numbers entered into
                 # NM_Aquifer without an area code
-                for p in (phone_number_str, f"505{phone_number_str}"):
-                    parsed_number = phonenumbers.parse(p, region)
-                    if phonenumbers.is_valid_number(parsed_number):
-                        formatted_number = phonenumbers.format_number(
-                            parsed_number, phonenumbers.PhoneNumberFormat.E164
-                        )
-                        return formatted_number
+                # for p in (
+                #     phone_number_str,
+                #     f"505{phone_number_str}",
+                #     f"575{phone_number_str}",
+                # ):
+                #     parsed_number = phonenumbers.parse(p, region)
+                #     if phonenumbers.is_valid_number(parsed_number):
+                #         formatted_number = phonenumbers.format_number(
+                #             parsed_number, phonenumbers.PhoneNumberFormat.E164
+                #         )
+                #         return formatted_number
                 else:
                     raise ValueError(f"Invalid phone number. {phone_number_str}")
             except NumberParseException as e:
@@ -89,7 +100,6 @@ class CreateEmail(BaseCreateModel, ValidateEmail):
     """
 
     contact_id: int | None = None  # set to None for when made via POST /contact
-    email: str
     email_type: str = "Primary"  # Default to 'Primary'
 
 
@@ -99,8 +109,8 @@ class CreatePhone(BaseCreateModel, ValidatePhone):
     """
 
     contact_id: int | None = None  # set to None for when made via POST /contact
-    phone_number: str
     phone_type: str = "Primary"  # Default to 'Primary'
+    nma_phone_number: str | None = None
 
 
 class CreateAddress(BaseCreateModel):
@@ -160,8 +170,9 @@ class PhoneResponse(BaseItemResponse):
     Response schema for phone details.
     """
 
-    phone_number: str
+    phone_number: str | None = None
     phone_type: str  # e.g., 'mobile', 'landline', etc.
+    nma_phone_number: str | None = None
 
 
 class EmailResponse(BaseItemResponse):

schemas/lexicon.py

@@ -13,8 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ===============================================================================
-from pydantic import BaseModel, ConfigDict
 from typing import List
+
+from pydantic import BaseModel, ConfigDict
+
 from schemas import UTCAwareDatetime
 
 

schemas/observation.py

@@ -14,14 +14,15 @@
 # limitations under the License.
 # ===============================================================================
 from datetime import timezone
+from typing import Annotated
+
 from pydantic import (
     BaseModel,
     AwareDatetime,
     PastDatetime,
     field_validator,
     model_validator,
 )
-from typing import Annotated
 from typing_extensions import Self
 
 from schemas import (

schemas/sample.py

@@ -14,14 +14,15 @@
 # limitations under the License.
 # ===============================================================================
 from datetime import timezone
+from typing import Annotated
+
 from pydantic import (
     BaseModel,
     field_validator,
     model_validator,
     AwareDatetime,
     PastDatetime,
 )
-from typing import Annotated
 from typing_extensions import Self
 
 from schemas import (
@@ -30,9 +31,9 @@
     BaseResponseModel,
     UTCAwareDatetime,
 )
-from schemas.thing import ThingResponse
-from schemas.field import FieldEventResponse, FieldActivityResponse
 from schemas.contact import ContactResponse
+from schemas.field import FieldEventResponse, FieldActivityResponse
+from schemas.thing import ThingResponse
 
 
 # -------- VALIDATE ----------

schemas/thing.py

@@ -20,6 +20,7 @@
 from schemas import BaseCreateModel, BaseUpdateModel, BaseResponseModel
 from schemas.location import LocationResponse
 
+
 # -------- VALIDATE ----------