Changeset 8217

Timestamp:

10/04/12 21:10:18 (8 years ago)

Author:

mnagni

Message:

Incomplete - # 22428: CEDA Project - observationCollection
 http://team.ceda.ac.uk/trac/ceda/ticket/22428

Location:

mauRepo/MolesManager/trunk/src

Files:

• MolesManager/moles3epb.py (modified) (3 diffs)
• MolesManager/molesSessionMiddleware.py (modified) (2 diffs)
• libs/migration/processor/commons.py (modified) (1 diff)
• libs/migration/tests/moles3epbmothods.py (modified) (4 diffs)
• libs/migration/tests/moles3epbtests.py (modified) (6 diffs)
• libs/migration/tests/test_utils.py (modified) (2 diffs)
• libs/migration/tests/testconfig.py (modified) (1 diff)

mauRepo/MolesManager/trunk/src/MolesManager/moles3epb.py

@@ -14 +14 @@
 from ea_model.moles3_4.observationcollection.mo_observationcollection import MO_ObservationCollection
 from ea_model.moles3_4.observation.mo_observation import MO_Observation
+from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project
 
 #molesDB = DbManager(MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT)
@@ -89 +90 @@
     def extractCollectionIdentifierByTitle(self, i_title, session = None):
         """
-            Loooks for an MD_Identifier from a CEDA_ObservationCollection contains a specific title (observation.identifier.code)
+            Searches for an MD_Identifier from a CEDA_ObservationCollection contains a specific title (observation.identifier.code)
             @param i_title: the CEDA_ObservationCollection.identifier.title value to search for
             @return: a tuple containing a CEDA_ObservationCollection and the CEDA_ObservationCollection.idenfitier element having the title  
@@ -97 +98 @@
             join(MO_ObservationCollection).join(MO_ObservationCollection.identifier). \
             join(MD_Identifier.authority).filter(CI_Citation.title.like('%' + i_title + '%'))
-    
+
+    @classmethod
+    def extractObservationsForProject(self, project, session = None):
+        """
+            Searches for the CEDA_Observation associated with a CEDA_Project
+            @param project: a CEDA_Project instance
+            @return: a tuple containing the associated CEDA_Observation  
+        """
+        intSession = Moles3EPB._getSession(session)
+        return intSession.query(CEDA_Observation). \
+            join(CEDA_Observation, MO_Observation.inSupportOf).filter(CEDA_Project.id == project.id)
+
+    @classmethod
+    def extractProjectObservationCollections(self, project, session = None):
+        """
+            Searches for the Observation_Collections associated with a CEDA_Project
+            @param project: a CEDA_Project instance
+            @return: a tuple containing the associated CEDA_ObservationCollection  
+        """
+        intSession = Moles3EPB._getSession(session)
+        mo_obs = intSession.query(MO_Observation).join(CEDA_Project).filter(CEDA_Project.id == project.id).subquery()      
+        obsers = intSession.query(CEDA_Observation).join(mo_obs, CEDA_Observation.id == mo_obs.c.id).one()
+        #print "obsers: " + str(intSession.query(CEDA_Observation).join(mo_obs, CEDA_Observation.id == mo_obs.c.id).count())
+        
+        cos = intSession.query(CEDA_ObservationCollection).all()
+        co = intSession.query(MO_ObservationCollection).join(MO_ObservationCollection.member).filter(MO_ObservationCollection.member.contains(obsers))
+        print co
+        print co.all()
+        
+        observations = intSession.query(MO_ObservationCollection).join(CEDA_Observation). \
+            filter(obsers.any(CEDA_Observation.id==obsers.c.id))
+        print "observation:" + str(observations.count())
+        return observations
+
     @classmethod
     def addObservationToObservationCollection(self, observationCollection, observation, session = None, commit = False):

mauRepo/MolesManager/trunk/src/MolesManager/molesSessionMiddleware.py

@@ -38 +38 @@
             pass
 
-
-
+    def _getNewMolesSession(self):
+        session = Moles3EPB.getNewMolesSession() 
+        MOLES3_DB_SCRIPT.attachEvents(session)
+        return session
     
     def _getMolesSession(self):
@@ -51 +53 @@
             
             self._initSearchIndexes(molesDB)
-            
-            return Moles3EPB.getNewMolesSession()
-        else:
-            return Moles3EPB.getNewMolesSession()
+
+        return self._getNewMolesSession()
     
     def _migration(self, runMigration = RUN_MIGRATION):

mauRepo/MolesManager/trunk/src/libs/migration/processor/commons.py

@@ -616 +616 @@
     return ci_party
 
+def createCI_Organization(name = None, contactInfo = None):
+    '''
+        Creates a new CI_Individual instance
+        @param name: a String
+        @param contactInfo: an array of CI_Contact        
+    '''    
+    ci_party = CI_Organisation()
+    if name:
+        ci_party.name = name
+    if contactInfo:
+        ci_party.contactInfo = contactInfo        
+    return ci_party
+
 def createMO_Organization(name = None, contactInfo = None):
     '''

mauRepo/MolesManager/trunk/src/libs/migration/tests/moles3epbmothods.py

@@ -11 +11 @@
 import logging
 from logging import StreamHandler
-from test_utils import createObservationCollection, createObservation
-from sqlalchemy.dialects import postgres
+from test_utils import createObservationCollection, createObservation, createProject
+from ea_model.moles3_4.observationcollection.mo_observationcollection import MO_ObservationCollection
 
 
@@ -30 +30 @@
 
     def runTest(self):
-        self.checkExtractCollectionIdentifierByTitle()   
-        self.checkExtractObservationByTitleKeywords() 
+        #self.checkExtractCollectionIdentifierByTitle()   
+        #self.checkExtractObservationByTitleKeywords() 
+        self.checkExtractProjectObservationCollections()
 
     def checkExtractCollectionIdentifierByTitle(self):
@@ -61 +62 @@
         self.assertTrue(obs.count() > 1, "Cannot find a CEDA_Observation")
         obs = Moles3EPB.extractObservationByTitleKeywords('dummy_code', session)
-        self.assertTrue(obs.count() == 0, "Should NOT find a CEDA_Observation")        
+        self.assertTrue(obs.count() == 0, "Should NOT find a CEDA_Observation")
+        session.delete(observation)
+        session.commit()           
 
+    def checkExtractProjectObservationCollections(self):
+        session = Moles3EPB.getNewMolesSession();
+
+        p_1 = createProject()
+        p_2 = createProject()
+        p_3 = createProject()        
+        p_4 = createProject()   
+        self._create([p_1, p_2, p_3, p_4], session)  
+        
+        o_1 = createObservation()
+        o_1.inSupportOf = p_1               
+        o_2 = createObservation()
+        o_2.inSupportOf = p_2        
+        o_3 = createObservation()                
+        o_3.inSupportOf = p_3
+        self._create([o_1, o_2, o_3], session)
+
+        oc_1 = createObservationCollection()
+        oc_2 = createObservationCollection()
+        oc_3 = createObservationCollection()        
+        self._create([oc_1, oc_2, oc_3], session)
+        oc_1.member.append(o_1)
+        session.commit()
+        
+        oc_2.member.append(o_1)
+        oc_2.member.append(o_2)
+        session.commit()
+        
+        oc_3.member.append(o_2)
+        oc_3.member.append(o_3)        
+        session.commit()
+
+        objects = [p_1, p_2, p_3, p_4, o_1, o_2, o_3, oc_1, oc_2, oc_3]
+
+
+                
+
+        try:            
+            res = Moles3EPB.extractProjectObservationCollections(p_1, session)
+            print res.count()
+            #for item in res:
+            #    print item
+            #self.assertTrue(res.count() == 2, "Cannot find a CEDA_Observationcollection")
+            #res = Moles3EPB.extractProjectObservationCollections(p_2, session)
+            #self.assertTrue(res.count() == 2, "Cannot find a CEDA_Observationcollection")
+            #res = Moles3EPB.extractProjectObservationCollections(p_3, session)
+            #self.assertTrue(res.count() == 1, "Cannot find a CEDA_Observationcollection")                        
+            #res = Moles3EPB.extractProjectObservationCollections(p_4, session)
+            #self.assertTrue(res.count() == 0, "Cannot find a CEDA_Observationcollection")            
+        except Exception as e:
+            print e
+            self._delete(objects, session)
+            self.assertTrue(True==False, "Error!")
+        self._delete(objects, session)                
+
+                    
     def _initSearchIndexes(self, db_manager):
         #To Be Done - CHECK IF THE COLUMN ALREADY EXISTS!
@@ -78 +137 @@
             pass
 
+    def _create(self, objects, session):
+        for item in objects:
+            Moles3EPB.addCedaObject(item, session)
+        session.commit()
 
+    def _delete(self, objects, session):
+        for item in objects:
+            session.delete(item)
+        session.commit()
 
 if __name__ == "__main__":

mauRepo/MolesManager/trunk/src/libs/migration/tests/moles3epbtests.py

@@ -5 +5 @@
 '''
 import unittest
-from testconfig import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT
+from testconfig import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT, EVENTS_DB
 from MolesManager.moles3epb import Moles3EPB
 from libs.commons_db import DbManager
@@ -16 +16 @@
 from libs.migration.processor.check.check import moles3Append
 from libs.migration.processor.commons import createCI_Date, createDateTime,\
-    createDate, createTM_Position, createTM_Instant, isoDateTimeStringToTimeDate
+    createDate, createTM_Position, createTM_Instant, createCI_Individual
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_datetypecode import CI_DateTypeCode
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_date import CI_Date
@@ -22 +22 @@
 from ea_model.iso_19108_2006_temporal_schema.temporal_reference_system.tm_position import TM_Position
 from test_utils import createObservationCollection,\
-    createProject
-from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project
+    createProject, createCI_Responsibility
+from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project  
 
 
@@ -30 +30 @@
     def setUp(self):
         #self._dropAllTables()      
-        Moles3EPBTest.molesDB = DbManager(MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT)
+        Moles3EPBTest.molesDB = DbManager(MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT)        
         Moles3EPB.overrrideDBManager(Moles3EPBTest.molesDB)
         self.logging = logging.getLogger('Moles3EPBTest')
@@ -41 +41 @@
 
     def runTest(self):
-        self.checkEmptyObservationCollection()
-        self.checkEmptyObservation()
-        self.checkObservation()
-        self.checkObservationCollection()
-        self.checkCI_Date()
-        self.checkTM_Instant()
-        self.checkTM_Position()        
+        #self.checkEmptyObservationCollection()
+        #self.checkEmptyObservation()
+        #self.checkObservation()
+        #self.checkObservationCollection()
+        #self.checkCI_Date()
+        #self.checkTM_Instant()
+        #self.checkTM_Position()
+        self.checkCI_Responsibility()    
 
     def checkEmptyObservationCollection(self):
@@ -205 +206 @@
         session.commit()
     
+    def checkCI_Responsibility(self):
+        session = Moles3EPB.getNewMolesSession();
+        EVENTS_DB(session)        
+        responsibility = createCI_Responsibility()
+        self.logging.info('Stores an empty new CEDA_Project')
+        Moles3EPB.addCedaObject(responsibility, session)
+        session.commit()
+        session.expunge(responsibility)
+        
+        ci_individual_2 = createCI_Individual('individual_2')
+        responsibility.party.append(ci_individual_2)
+        session.merge(responsibility, cascade="merge")        
+        session.commit()        
+        
+        for item in responsibility.party:
+            if item.name == 'individual_1':
+                responsibility.party.remove(item)
+                
+        session.merge(responsibility)
+        session.commit()        
+        print responsibility
+        session.refresh(responsibility)
+        session.delete(responsibility)
+        session.commit()        
+        
 
     def _createObservation(self):

mauRepo/MolesManager/trunk/src/libs/migration/tests/test_utils.py

@@ -6 +6 @@
 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection
 from libs.migration.processor.commons import createMD_Identifier,\
-    createCI_Citation
+    createCI_Citation, createCI_Individual, createCI_Organization
 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation
 from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project
+from ea_model.upcomingiso.ci_responsibility import CI_Responsibility
+from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information import ci_rolecode
+from ea_model.upcomingiso.ci_individual import CI_Individual
 
 def createObservationCollection():
@@ -38 +41 @@
     return observation
 
+def createCI_Responsibility():
+    '''
+        Creates a CI_Responsibility with the following data:
+        ci_responsibilty.role = 'ci_rolecode.CI_RoleCode.cl_author
+        ci_responsibilty.party[0]
+            CI_Individual.name = 'individual_1'
+        ci_responsibilty.party[1]
+            CI_Organization.name = 'organization_1'
+    '''    
+    ci_responsibilty = CI_Responsibility()
+    ci_responsibilty.role = ci_rolecode.CI_RoleCode.cl_author
+    ci_individual_1 = createCI_Individual('individual_1')
+    ci_responsibilty.party.append(ci_individual_1)
+    ci_organization_1 = createCI_Organization('organization_1')
+    ci_responsibilty.party.append(ci_organization_1)   
+    return ci_responsibilty
+
 def createProject():
     '''

mauRepo/MolesManager/trunk/src/libs/migration/tests/testconfig.py

@@ -10 +10 @@
 MIGRATION_DB_SCRIPT = doMigration
 
-from sqlTables import doTables as doMoles
-MOLES3_DB_SCRIPT = doMoles 
+
+from sqlTables import doTables as doMoles, attachEvents
+MOLES3_DB_SCRIPT = doMoles
+EVENTS_DB = attachEvents