add Annotation objects and query

Author: sreeder

odm2api/ODM2/models.py

@@ -1136,29 +1136,137 @@ class ResultAnnotations(Base):
     AnnotationObj = relationship(Annotations)
     ResultObj = relationship(Results)
 
+class SamplingFeatureAnnotations(Base):
+    __tablename__ = u'samplingfeatureannotations'
+    __table_args__ = {u'schema': 'odm2'}  # __table_args__ = {u'schema': Schema.getSchema()}
+
+    BridgeID = Column('bridgeid', Integer, primary_key=True, nullable=False)
+    SamplingFeatureID = Column('samplingfeatureid', ForeignKey(SamplingFeatures.SamplingFeatureID),
+                               nullable=False)
+    AnnotationID = Column('annotationid', ForeignKey(Annotations.AnnotationID), nullable=False)
+
+    AnnotationObj = relationship(Annotations)
+    SamplingFeatureObj = relationship(SamplingFeatures)
 
-class ResultValueAnnotations(Base):
-    __tablename__ = u'resultvalueannotations'
+
+class CategoricalResultValueAnnotations(Base):
+    __tablename__ = u'categoricalresultvalueannotations'
     __table_args__ = {u'schema': 'odm2'}  # __table_args__ = {u'schema': Schema.getSchema()}
 
     BridgeID = Column('bridgeid', Integer, primary_key=True, nullable=False)
-    ValueID = Column('valueid', BigInteger, nullable=False)
+    ValueID = Column('valueid', BigInteger, ForeignKey(CategoricalResultValues.ValueID)  ,nullable=False)
     AnnotationID = Column('annotationid', ForeignKey(Annotations.AnnotationID), nullable=False)
 
     AnnotationObj = relationship(Annotations)
+    ValueObj = relationship(CategoricalResultValues)
 
 
-class SamplingFeatureAnnotations(Base):
-    __tablename__ = u'samplingfeatureannotations'
+class EquipmentAnnotations(Base):
+    __tablename__ = u'equipmentannotations'
     __table_args__ = {u'schema': 'odm2'}  # __table_args__ = {u'schema': Schema.getSchema()}
 
     BridgeID = Column('bridgeid', Integer, primary_key=True, nullable=False)
-    SamplingFeatureID = Column('samplingfeatureid', ForeignKey(SamplingFeatures.SamplingFeatureID),
-                               nullable=False)
+    EquipmentID = Column('valueid', BigInteger, ForeignKey(Equipment.ValueID)  ,nullable=False)
     AnnotationID = Column('annotationid', ForeignKey(Annotations.AnnotationID), nullable=False)
 
     AnnotationObj = relationship(Annotations)
-    SamplingFeatureObj = relationship(SamplingFeatures)
+    EquipmentObj = relationship(Equipment)
+
+
+class MeasurementResultValueAnnotations(Base):
+    __tablename__ = u'measurementresultvalueannotations'
+    __table_args__ = {u'schema': 'odm2'}  # __table_args__ = {u'schema': Schema.getSchema()}
+
+    BridgeID = Column('bridgeid', Integer, primary_key=True, nullable=False)
+    ValueID = Column('valueid', BigInteger, ForeignKey(MeasurementResultValues.ValueID)  ,nullable=False)
+    AnnotationID = Column('annotationid', ForeignKey(Annotations.AnnotationID), nullable=False)
+
+    AnnotationObj = relationship(Annotations)
+    ValueObj = relationship(MeasurementResultValues)
+
+
+class PointCoverageResultValueAnnotations(Base):
+    __tablename__ = u'pointcoverageresultvalueannotations'
+    __table_args__ = {u'schema': 'odm2'}  # __table_args__ = {u'schema': Schema.getSchema()}
+
+    BridgeID = Column('bridgeid', Integer, primary_key=True, nullable=False)
+    ValueID = Column('valueid', BigInteger, ForeignKey(PointCoverageResultValues.ValueID)  ,nullable=False)
+    AnnotationID = Column('annotationid', ForeignKey(Annotations.AnnotationID), nullable=False)
+
+    AnnotationObj = relationship(Annotations)
+    ValueObj = relationship(PointCoverageResultValues)
+
+
+class ProfileResultValueAnnotations(Base):
+    __tablename__ = u'profileresultvalueannotations'
+    __table_args__ = {u'schema': 'odm2'}  # __table_args__ = {u'schema': Schema.getSchema()}
+
+    BridgeID = Column('bridgeid', Integer, primary_key=True, nullable=False)
+    ValueID = Column('valueid', BigInteger, ForeignKey(ProfileResultValues.ValueID)  ,nullable=False)
+    AnnotationID = Column('annotationid', ForeignKey(Annotations.AnnotationID), nullable=False)
+
+    AnnotationObj = relationship(Annotations)
+    ValueObj = relationship(ProfileResultValues)
+
+
+class SectionResultValueAnnotations(Base):
+    __tablename__ = u'sectionResultValueAnnotations'
+    __table_args__ = {u'schema': 'odm2'}  # __table_args__ = {u'schema': Schema.getSchema()}
+
+    BridgeID = Column('bridgeid', Integer, primary_key=True, nullable=False)
+    ValueID = Column('valueid', BigInteger, ForeignKey(SectionResultValues.ValueID)  ,nullable=False)
+    AnnotationID = Column('annotationid', ForeignKey(Annotations.AnnotationID), nullable=False)
+
+    AnnotationObj = relationship(Annotations)
+    ValueObj = relationship(SectionResultValues)
+
+
+class SpectraResultValueAnnotations(Base):
+    __tablename__ = u'spectraresultvalueannotations'
+    __table_args__ = {u'schema': 'odm2'}  # __table_args__ = {u'schema': Schema.getSchema()}
+
+    BridgeID = Column('bridgeid', Integer, primary_key=True, nullable=False)
+    ValueID = Column('valueid', BigInteger, ForeignKey(SpectraResultValues.ValueID)  ,nullable=False)
+    AnnotationID = Column('annotationid', ForeignKey(Annotations.AnnotationID), nullable=False)
+
+    AnnotationObj = relationship(Annotations)
+    ValueObj = relationship(SpectraResultValues)
+
+
+class TimeSeriesResultValueAnnotations(Base):
+    __tablename__ = u'timeseriesresultvalueannotations'
+    __table_args__ = {u'schema': 'odm2'}  # __table_args__ = {u'schema': Schema.getSchema()}
+
+    BridgeID = Column('bridgeid', Integer, primary_key=True, nullable=False)
+    ValueID = Column('valueid', BigInteger, ForeignKey(TimeSeriesResultValues.ValueID)  ,nullable=False)
+    AnnotationID = Column('annotationid', ForeignKey(Annotations.AnnotationID), nullable=False)
+
+    AnnotationObj = relationship(Annotations)
+    ValueObj = relationship(TimeSeriesResultValues)
+
+
+class TrajectoryResultValueAnnotations(Base):
+    __tablename__ = u'trajectoryresultvalueannotations'
+    __table_args__ = {u'schema': 'odm2'}  # __table_args__ = {u'schema': Schema.getSchema()}
+
+    BridgeID = Column('bridgeid', Integer, primary_key=True, nullable=False)
+    ValueID = Column('valueid', BigInteger, ForeignKey(TrajectoryResultValues.ValueID)  ,nullable=False)
+    AnnotationID = Column('annotationid', ForeignKey(Annotations.AnnotationID), nullable=False)
+
+    AnnotationObj = relationship(Annotations)
+    ValueObj = relationship(TrajectoryResultValues)
+
+
+class TransectResultValueAnnotations(Base):
+    __tablename__ = u'transectresultvalueannotations'
+    __table_args__ = {u'schema': 'odm2'}  # __table_args__ = {u'schema': Schema.getSchema()}
+
+    BridgeID = Column('bridgeid', Integer, primary_key=True, nullable=False)
+    ValueID = Column('valueid', BigInteger, ForeignKey(TransectResultValues.ValueID)  ,nullable=False)
+    AnnotationID = Column('annotationid', ForeignKey(Annotations.AnnotationID), nullable=False)
+
+    AnnotationObj = relationship(Annotations)
+    ValueObj = relationship(TransectResultValues)
 
 
 # ################################################################################

odm2api/ODM2/services/readService.py

@@ -50,6 +50,32 @@ def __init__(self, session):
     # Annotations
     # ################################################################################
 
+    def getAnnotations(self, type=None)
+
+        #TODO What keywords do I use for type
+        a = Annotations
+        if type =="action":
+            a=ActionAnnotations
+        elif type =="categoricalResultValue":
+            a=CategoricalResultAnnotations
+        elif type =="equipmentAnnotation":
+            a=EquipmentAnnotations
+        elif type =="measurementResultValue":
+        elif type =="method":
+        elif type =="pointCoverageResultValue":
+        elif type =="profileResultValue":
+        elif type =="result":
+        elif type =="samplingFeature":
+        elif type =="sectionResultValue":
+        elif type =="spectraResultValue":
+        elif type =="timeSeriesResultValue":
+        elif type =="trajectoryResultValue":
+        elif type =="transectResultValue":
+        try:
+            return self._session.query(a).all()
+        except:
+            return None
+
 
 
 
@@ -519,7 +545,7 @@ def getSiteBySFId(self, siteId):
         :param siteId:
             :type Integer:
         :return Return matching Site Object filtered by siteId:
-            :type Site: 
+            :type Site:
         """
         try:
             return self._session.query(Sites).filter_by(SamplingFeatureID=siteId).one()