SSS-349

Author: dtheiler

servs/filerepo/filerepo.datatypes/src/main/java/at/kc/tugraz/ss/service/filerepo/datatypes/SSFile.java

@@ -85,20 +85,22 @@ protected SSFile(
 
   public static SSFile get(
     final SSUri        id, 
+    final SSEntityE    type,
     final SSFileExtE   fileExt,
     final SSMimeTypeE  mimeType, 
     final SSUri        downloadLink) throws Exception{
 
-    return new SSFile(id, fileExt, mimeType, downloadLink);
+    return new SSFile(id, type, fileExt, mimeType, downloadLink);
   }
 
   public SSFile(
     final SSUri        id,
+    final SSEntityE    type,
     final SSFileExtE   fileExt,
     final SSMimeTypeE  mimeType, 
     final SSUri        downloadLink) throws Exception{
 
-    super(id, SSEntityE.file);
+    super(id, type);
 
     this.fileExt      = fileExt;
     this.mimeType     = mimeType;

servs/filerepo/filerepo.impl/src/main/java/at/kc/tugraz/ss/service/filerepo/impl/SSFilerepoImpl.java

@@ -397,10 +397,12 @@ public SSFile fileGet(final SSFileGetPar par) throws Exception{
             SSFileU.correctDirPath(SSVocConf.restAPIResourceFile)           +
             SSFileU.correctDirPath(SSVocConf.fileIDFromSSSURI(par.file))    +
             SSVocConf.restAPIPathFileDownloadPublic);
+      final SSEntityE fileType = sqlFct.getFileType(par.file);
 
       final SSFile      file  = 
         SSFile.get(
-          par.file, 
+          par.file,
+          fileType,
           fileExt, 
           mimeType,
           downloadLink);

servs/filerepo/filerepo.impl/src/main/java/at/kc/tugraz/ss/service/filerepo/impl/fct/SSFileSQLFct.java

@@ -21,6 +21,7 @@
 package at.kc.tugraz.ss.service.filerepo.impl.fct;
 
 import at.tugraz.sss.serv.SSDBSQLFct;
+import at.tugraz.sss.serv.SSEntityE;
 import at.tugraz.sss.serv.SSErr;
 import at.tugraz.sss.serv.SSErrE;
 import at.tugraz.sss.serv.SSObjU;
@@ -108,4 +109,31 @@ public void addFileToEntity(
       SSServErrReg.regErrThrow(error);
     }
   }
-}
+  
+  public SSEntityE getFileType(final SSUri file) throws  Exception{
+    
+    ResultSet resultSet = null;
+    
+    try{
+      
+      final List<String>        columns           = new ArrayList<>();
+      final Map<String, String> wheres            = new HashMap<>();
+      
+      column(columns, SSSQLVarNames.type);
+      
+      where(wheres, SSSQLVarNames.id, file);
+      
+      resultSet = dbSQL.select(SSSQLVarNames.entityTable, columns, wheres, null, null, null);
+      
+      checkFirstResult(resultSet);
+      
+      return bindingStrToEntityType(resultSet, SSSQLVarNames.type);
+      
+    }catch(Exception error){
+      SSServErrReg.regErrThrow(error);
+      return null;
+    }finally{
+      dbSQL.closeStmt(resultSet);
+    }
+  }
+}