Updated models. RelatedModels to use RelatedId, and Not RelationID. Relationship was reversed. getRelatedModelsByCode returned Parent models and not child models.

Author: valentinedwv

odm2api/ODM2/models.py

@@ -1024,7 +1024,7 @@ class RelatedModels(Base):
     __tablename__ = 'relatedmodels'
     __table_args__ = {u'schema': 'odm2'}  # __table_args__ = {u'schema': Schema.getSchema()}
 
-    RelationID = Column('relationid', Integer, primary_key=True, nullable=False)
+    RelatedID = Column('relatedid', Integer, primary_key=True, nullable=False)
     ModelID = Column('modelid', ForeignKey(Models.ModelID), nullable=False)
     RelationshipTypeCV = Column('relationshiptypecv', ForeignKey(CVRelationshipType.Name), nullable=False,
                                 index=True)

odm2api/ODM2/models_sqlite.py

@@ -1016,7 +1016,7 @@ class RelatedModels(Base):
     __tablename__ = 'relatedmodels'
     # __table_args__ = {u'schema': 'odm2'}  # # __table_args__ = {u'schema': Schema.getSchema()}
 
-    RelationID = Column('relationid', Integer, primary_key=True, nullable=False)
+    RelatedID = Column('relatedid', Integer, primary_key=True, nullable=False)
     ModelID = Column('modelid', ForeignKey(Models.ModelID), nullable=False)
     RelationshipTypeCV = Column('relationshiptypecv', ForeignKey(CVRelationshipType.Name), nullable=False,
                                 index=True)

odm2api/ODM2/services/readService.py

@@ -944,7 +944,8 @@ def getRelatedModelsByID(self, modelid):
         :return: all models related to the specified id
         """
         try:
-            return self._session.query(RelatedModels).filter_by(RelatedModelID=modelid).all()
+            # note this was RelatedModelID = modelid  which would return all Parent models of  RelatedModelID
+            return self._session.query(RelatedModels).filter_by(ModelID=modelid).all()
         except Exception, e:
             print e
         return None
@@ -956,7 +957,8 @@ def getRelatedModelsByCode(self, modelcode):
         :return: all models related to the provided model code
         """
         try:
-            return self._session.query(RelatedModels).join(Models, RelatedModels.RelatedModelID == Models.ModelID) \
+            # note this was RelatedModels.RelatedModelID == Models.ModelID which would return all Parent models of  RelatedModelID
+            return self._session.query(RelatedModels).join(Models, RelatedModels.ModelID == Models.ModelID) \
                 .filter(Models.ModelCode == modelcode).all()
         except Exception, e:
             print e