Download uploaded files.

portal/model.py

@@ -28,6 +28,7 @@ class UploadSolar(db.Model):
     school_year = db.Column(db.String, nullable=True)
     grammar_corrections = db.Column(db.String, nullable=True)
     upload_file_hashes = db.Column(sqlalchemy.types.ARRAY(db.String), nullable=True)
+    upload_file_names = db.Column(sqlalchemy.types.ARRAY(db.String), nullable=True)
 
 
 class ContractsSolar(db.Model):

portal/solar.py

@@ -153,8 +153,7 @@ class UploadHandlerSolar():
         timestamp = datetime.fromtimestamp(upload_metadata['timestamp'])
         form_data = upload_metadata['form_data']
         file_hashes = upload_metadata['file_hashes_dict']
-        sorted_f_hashes = list(file_hashes.values())
-        sorted_f_hashes.sort()
+        sorted_file_items = sorted(file_hashes.items(), key=lambda item: item[1])
 
         institution_id = get_user_institution(user_id).id
 
@@ -171,7 +170,8 @@ class UploadHandlerSolar():
                     text_type_custom=form_data['vrsta-custom'],
                     school_year=form_data['solsko-leto'],
                     grammar_corrections=form_data['jezikovni-popravki'],
-                    upload_file_hashes=sorted_f_hashes
+                    upload_file_hashes=[x[1] for x in sorted_file_items],
+                    upload_file_names=[x[0] for x in sorted_file_items],
                )
         UploadHandlerSolar.store_model(model_obj)
 
@@ -392,6 +392,9 @@ def get_upload_history(user_id, n=20):
 def get_institution_upload_history(institution_id, n=20):
     return UploadSolar.query.filter_by(institution=institution_id).order_by(desc(UploadSolar.timestamp)).limit(n).all()
 
+def get_upload_object(upload_id):
+    return UploadSolar.query.filter_by(id=upload_id).first()
+
 def get_all_upload_history(n=20):
     if n == -1:
         return UploadSolar.query.order_by(desc(UploadSolar.timestamp)).all()