more alignment

Author: d-j-hatton

src/murfey/util/db.py

@@ -969,8 +969,12 @@ class BFactors(SQLModel, table=True):  # type: ignore
 
 class MotionCorrection(SQLModel, table=True):  # type: ignore
     motionCorrectionId: int = Field(primary_key=True, unique=True)
-    dataCollectionId: Optional[int] = Field(foreign_key="datacollection.id")
-    autoProcProgramId: Optional[int] = Field(foreign_key="autoprocprogram.id")
+    dataCollectionId: Optional[int] = Field(
+        foreign_key="datacollection.dataCollectionId"
+    )
+    autoProcProgramId: Optional[int] = Field(
+        foreign_key="autoprocprogram.autoProcProgramId"
+    )
     imageNumber: Optional[int] = None
     firstFrame: Optional[int] = None
     lastFrame: Optional[int] = None
@@ -986,7 +990,7 @@ class MotionCorrection(SQLModel, table=True):  # type: ignore
     fftFullPath: Optional[str] = None
     fftCorrectedFullPath: Optional[str] = None
     comments: Optional[str] = None
-    movieId: Optional[int] = Field(foreign_key="movie.murfey_id")
+    movieId: Optional[int] = Field(foreign_key="movie.movieId")
     auto_proc_program: Optional["AutoProcProgram"] = Relationship(
         back_populates="motion_correction"
     )
@@ -1008,7 +1012,9 @@ class CTF(SQLModel, table=True):  # type: ignore
     motionCorrectionId: Optional[int] = Field(
         foreign_key="motioncorrection.motionCorrectionId"
     )
-    autoProcProgramId: Optional[int] = Field(foreign_key="autoprocprogram.id")
+    autoProcProgramId: Optional[int] = Field(
+        foreign_key="autoprocprogram.autoProcProgramId"
+    )
     boxSizeX: Optional[float] = None
     boxSizeY: Optional[float] = None
     minResolution: Optional[float] = None
@@ -1031,7 +1037,7 @@ class CTF(SQLModel, table=True):  # type: ignore
 
 class ParticlePicker(SQLModel, table=True):  # type: ignore
     particlePickerId: int = Field(primary_key=True, unique=True)
-    programId: Optional[int] = Field(foreign_key="autoprocprogram.id")
+    programId: Optional[int] = Field(foreign_key="autoprocprogram.autoProcProgramId")
     firstMotionCorrectionId: Optional[int] = Field(
         foreign_key="motioncorrection.motionCorrectionId"
     )
@@ -1052,8 +1058,12 @@ class ParticlePicker(SQLModel, table=True):  # type: ignore
 
 class Tomogram(SQLModel, table=True):  # type: ignore
     tomogramId: int = Field(primary_key=True, unique=True)
-    dataCollectionId: Optional[int] = Field(foreign_key="datacollection.id")
-    autoProcProgramId: Optional[int] = Field(foreign_key="autoprocprogram.id")
+    dataCollectionId: Optional[int] = Field(
+        foreign_key="datacollection.dataCollectionId"
+    )
+    autoProcProgramId: Optional[int] = Field(
+        foreign_key="autoprocprogram.autoProcProgramId"
+    )
     volumeFile: Optional[str] = None
     stackFile: Optional[str] = None
     sizeX: Optional[int] = None
@@ -1104,7 +1114,9 @@ class RelativeIceThickness(SQLModel, table=True):  # type: ignore
     motionCorrectionId: Optional[int] = Field(
         foreign_key="motioncorrection.motionCorrectionId"
     )
-    autoProcProgramId: Optional[int] = Field(foreign_key="autoprocprogram.id")
+    autoProcProgramId: Optional[int] = Field(
+        foreign_key="autoprocprogram.autoProcProgramId"
+    )
     minimum: Optional[float] = None
     q1: Optional[float] = None
     median: Optional[float] = None
@@ -1119,7 +1131,7 @@ class RelativeIceThickness(SQLModel, table=True):  # type: ignore
 
 
 class TiltImageAlignment(SQLModel, table=True):  # type: ignore
-    movieId: int = Field(foreign_key="movie.murfey_id", primary_key=True)
+    movieId: int = Field(foreign_key="movie.movieId", primary_key=True)
     tomogramId: int = Field(foreign_key="tomogram.tomogramId", primary_key=True)
     defocusU: Optional[float] = None
     defocusV: Optional[float] = None
@@ -1139,7 +1151,7 @@ class ParticleClassificationGroup(SQLModel, table=True):  # type: ignore
     particlePickerId: Optional[int] = Field(
         foreign_key="particlepicker.particlePickerId"
     )
-    programId: Optional[int] = Field(foreign_key="autoprocprogram.id")
+    programId: Optional[int] = Field(foreign_key="autoprocprogram.autoProcProgramId")
     type: Optional[str] = Enum("2D", "3D")
     batchNumber: Optional[int] = None
     numberOfParticlesPerBatch: Optional[int] = None