Changeset 15416 for main/waeup.kofa/trunk/src

Timestamp:

21 May 2019, 08:02:51 (6 years ago)

Author:

Henrik Bettermann

Message:

Backup deleted graduated student data somewhere else to ease graduated student data migration.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• datacenter.py (modified) (2 diffs)
• doctests/batchprocessing_browser.txt (modified) (1 diff)
• doctests/datacenter.txt (modified) (7 diffs)
• doctests/pages.txt (modified) (2 diffs)
• interfaces.py (modified) (1 diff)
• students/batching.py (modified) (1 diff)
• students/student.py (modified) (1 diff)
• students/tests/test_student.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/datacenter.py

@@ -58 +58 @@
         """Create standard subdirs.
         """
-        for name in ['finished', 'unfinished', 'logs', 'deleted']:
+        for name in ['finished', 'graduated', 'unfinished', 'logs', 'deleted']:
             path = os.path.join(self.storage, name)
             if os.path.exists(path):
@@ -67 +67 @@
     @property
     def deleted_path(self):
-        """Get the path for deleted object data.
+        """Get the path for deleted student data.
         """
         return os.path.join(self.storage, 'deleted')
+
+    @property
+    def graduated_path(self):
+        """Get the path for deleted graduated student data.
+        """
+        return os.path.join(self.storage, 'graduated')
 
     def getPendingFiles(self, sort='name'):

main/waeup.kofa/trunk/src/waeup/kofa/doctests/batchprocessing_browser.txt

@@ -644 +644 @@
 
     >>> sorted(os.listdir(dc_path))
-    ['deleted', 'finished', 'logs', 'unfinished', 'users_zope.mgr.create.pending.csv']
+    ['deleted', 'finished', 'graduated', 'logs', 'unfinished', 'users_zope.mgr.create.pending.csv']
 
     >>> os.listdir(dc_path + '/unfinished')

main/waeup.kofa/trunk/src/waeup/kofa/doctests/datacenter.txt

@@ -23 +23 @@
     '/tmp/tmp...'
 
-Beside other things it provides a location to put data of deleted
+Beside other things it provides two locations to put data of deleted
 items into:
 
@@ -29 +29 @@
     >>> del_path = mydatacenter.deleted_path
     >>> os.path.isdir(del_path)
+    True
+    >>> grad_path = mydatacenter.graduated_path
+    >>> os.path.isdir(grad_path)
     True
 
@@ -163 +166 @@
     ...                            pending_src, mode='create')
     >>> sorted(os.listdir(dc_root))
-    ['deleted', 'finished', 'logs', 'unfinished']
+    ['deleted', 'finished', 'graduated', 'logs', 'unfinished']
 
     >>> sorted(os.listdir(fin_dir))
@@ -188 +191 @@
     ...                                 pending_src, mode='create')
     >>> sorted(os.listdir(dc_root))
-    ['deleted', 'finished', 'logs', 'mysource.create.pending.csv', 'unfinished']
+    ['deleted', 'finished', 'graduated', 'logs', 'mysource.create.pending.csv', 'unfinished']
 
     >>> sorted(os.listdir(fin_dir))
@@ -209 +212 @@
 
     >>> sorted(os.listdir(dc_root))
-    ['deleted', 'finished', 'logs', 'unfinished']
+    ['deleted', 'finished', 'graduated', 'logs', 'unfinished']
 
     >>> sorted(os.listdir(fin_dir))
@@ -245 +248 @@
 
     >>> sorted(os.listdir(dc_root))
-    ['deleted', 'finished', 'logs', 'mysource.create.pending.csv', 'unfinished']
+    ['deleted', 'finished', 'graduated', 'logs', 'mysource.create.pending.csv', 'unfinished']
 
     >>> sorted(os.listdir(fin_dir))
@@ -261 +264 @@
 
     >>> sorted(os.listdir(dc_root))
-    ['deleted', 'finished', 'logs', 'unfinished']
+    ['deleted', 'finished', 'graduated', 'logs', 'unfinished']
 
     >>> sorted(os.listdir(fin_dir))

main/waeup.kofa/trunk/src/waeup/kofa/doctests/pages.txt

@@ -1220 +1220 @@
 
   >>> sorted(os.listdir(uploadpath))
-  ['deleted', 'finished', 'logs', 'unfinished']
+  ['deleted', 'finished', 'graduated', 'logs', 'unfinished']
 
 
@@ -1261 +1261 @@
 
   >>> sorted(os.listdir(uploadpath))
-  ['deleted', 'finished', 'logs', 'myfaculties_zope.mgr.csv', 'unfinished']
+  ['deleted', 'finished', 'graduated', 'logs', 'myfaculties_zope.mgr.csv', 'unfinished']
 
 We create and upload also a CSV file containing departments:

main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py

@@ -929 +929 @@
 
     deleted_path = schema.Bytes(
-        title = u'Path were data about deleted objects should be stored.'
+        title = u'Path for deleted student data.'
+        )
+
+    graduated_path = schema.Bytes(
+        title = u'Path for deleted graduated student data.'
         )
 

main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

@@ -652 +652 @@
     `ticket_session` is an additional attribute which can be used to store the 
     session of the course when it was taken. Usually this information is 
-    redundantbecause the the parent study level object already contains this 
+    redundant because the the parent study level object already contains this
     information except for the study level zero container which can be used to
     store 'orphaned' course tickets.

main/waeup.kofa/trunk/src/waeup/kofa/students/student.py

@@ -486 +486 @@
     del_dir = site['datacenter'].deleted_path
 
+    if student.state == GRADUATED:
+        del_dir = site['datacenter'].graduated_path
+
     # save files of the student
     move_student_files(student, del_dir)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py

@@ -30 +30 @@
 from zope.interface import verify
 from zope.schema.interfaces import RequiredMissing
+from hurry.workflow.interfaces import IWorkflowState
 from waeup.kofa.interfaces import IExtFileStore, IFileStoreNameChooser
 from waeup.kofa.students.student import (
@@ -180 +181 @@
             del_dir, 'media', 'students', '00110', 'A111111',
             'passport_A111111.jpg')
-
         # The image was copied over
         self.assertTrue(os.path.isfile(del_img_path))
@@ -186 +186 @@
             open(del_img_path, 'rb').read(),
             self.image_contents)
-
         # The student data were put into CSV files
         STUDENT_BACKUP_EXPORTER_NAMES = getUtility(
             IStudentsUtils).STUDENT_BACKUP_EXPORTER_NAMES
-
+        for name in STUDENT_BACKUP_EXPORTER_NAMES:
+            csv_path = os.path.join(del_dir, '%s.csv' % name)
+            self.assertTrue(os.path.isfile(csv_path))
+            contents = open(csv_path, 'rb').read().split('\r\n')
+            # We expect 3 lines output including a linebreak at end of file.
+            self.assertEqual(len(contents), 3)
+        return
+
+    def test_backup_single_graduated_data(self):
+        # when a single graduated student is removed, the data is backed up
+        # somewhere else
+        self.setup_student(self.student)
+        IWorkflowState(self.student).setState('graduated')
+        # Add a fake image
+        self.create_passport_img(self.student)
+        handle_student_removed(self.student, None)
+        del_dir = self.app['datacenter'].graduated_path
+        del_img_path = os.path.join(
+            del_dir, 'media', 'students', '00110', 'A111111',
+            'passport_A111111.jpg')
+        # The image was copied over
+        self.assertTrue(os.path.isfile(del_img_path))
+        self.assertEqual(
+            open(del_img_path, 'rb').read(),
+            self.image_contents)
+        # The student data were put into CSV files
+        STUDENT_BACKUP_EXPORTER_NAMES = getUtility(
+            IStudentsUtils).STUDENT_BACKUP_EXPORTER_NAMES
         for name in STUDENT_BACKUP_EXPORTER_NAMES:
             csv_path = os.path.join(del_dir, '%s.csv' % name)