AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

EDMIService: fix NewFile method

Browse Source
This commit is contained in:
Jonathan Jenne 2022-01-17 11:06:01 +01:00
parent a8f3828ad3
commit 0935510496
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Service.EDMIService/EDMIService.vb
View File

@ -74,7 +74,7 @@ Public Class EDMIService
End Function End Function
#End Region #End Region
Public Function NewFile(Data As NewFile.VersionFileRequest) As NewFile.VersionFileResponse Implements IEDMIService.NewFile Public Function NewFile(Data As NewFile.NewFileRequest) As NewFile.NewFileResponse Implements IEDMIService.NewFile
_Logger.Debug("Start of Method [NewFile]") _Logger.Debug("Start of Method [NewFile]")
Dim oNewFile As New NewFile.NewFileMethod(LogConfig, MSSQL_IDB, MSSQL_ECM, GlobalState) Dim oNewFile As New NewFile.NewFileMethod(LogConfig, MSSQL_IDB, MSSQL_ECM, GlobalState)
Return oNewFile.Run(Data) Return oNewFile.Run(Data)

2
Service.EDMIService/IEDMIService.vb
View File

@ -81,7 +81,7 @@ Interface IEDMIService
#Region "Document (New)" #Region "Document (New)"
<OperationContract> <OperationContract>
Function NewFile(Data As NewFile.VersionFileRequest) As NewFile.VersionFileResponse Function NewFile(Data As NewFile.NewFileRequest) As NewFile.NewFileResponse
<OperationContract> <OperationContract>
Function VersionFile(Data As VersionFile.VersionFileRequest) As VersionFile.VersionFileResponse Function VersionFile(Data As VersionFile.VersionFileRequest) As VersionFile.VersionFileResponse

14
Service.EDMIService/Methods/IDB/NewFile/NewFileMethod.vb
View File

@ -2,8 +2,6 @@
Imports DigitalData.Modules.Database Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Database.MSSQLServer.TransactionMode Imports DigitalData.Modules.Database.MSSQLServer.TransactionMode
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Services.EDMIService.Methods
Imports DigitalData.Services.EDMIService.GlobalState
Namespace Methods.IDB.NewFile Namespace Methods.IDB.NewFile
Public Class NewFileMethod Public Class NewFileMethod
@ -19,12 +17,12 @@ Namespace Methods.IDB.NewFile
Transaction = Connection.BeginTransaction() Transaction = Connection.BeginTransaction()
End Sub End Sub
Public Function Run(pData As NewFile.VersionFileRequest) As Methods.IDB.NewFile.VersionFileResponse Public Function Run(pData As NewFile.NewFileRequest) As NewFile.NewFileResponse
Dim oFilePath As String = Nothing Dim oFilePath As String = Nothing
Dim oExistingObjectId = TestFileChecksumExists(pData.File.FileChecksum) Dim oExistingObjectId = TestFileChecksumExists(pData.File.FileChecksum)
If oExistingObjectId > 0 Then If oExistingObjectId > 0 Then
Return New NewFile.VersionFileResponse(oExistingObjectId) Return New NewFile.NewFileResponse(oExistingObjectId)
End If End If
Try Try
@ -36,9 +34,7 @@ Namespace Methods.IDB.NewFile
' Find ObjectStore by Title ' Find ObjectStore by Title
Logger.Debug("Checking for DataStore [{0}].", pData.StoreName) Logger.Debug("Checking for DataStore [{0}].", pData.StoreName)
Dim oStore = GlobalState.ObjectStores. Dim oStore = GlobalState.ObjectStores.Where(Function(store) store.Title.Equals(pData.StoreName, StringComparison.OrdinalIgnoreCase)).SingleOrDefault()
Where(Function(store) store.Title.Equals(pData.StoreName, StringComparison.OrdinalIgnoreCase)).
SingleOrDefault()
If oStore Is Nothing Then If oStore Is Nothing Then
LogAndThrow($"DataStore [{pData.StoreName}] does not exist. Exiting.") LogAndThrow($"DataStore [{pData.StoreName}] does not exist. Exiting.")
@ -157,7 +153,7 @@ Namespace Methods.IDB.NewFile
' Finally, commit the transaction ' Finally, commit the transaction
Transaction?.Commit() Transaction?.Commit()
Return New NewFile.VersionFileResponse(oObjectId) Return New NewFile.NewFileResponse(oObjectId)
Catch ex As Exception Catch ex As Exception
Logger.Warn("Error occurred while creating file!") Logger.Warn("Error occurred while creating file!")
Logger.Error(ex) Logger.Error(ex)
@ -175,7 +171,7 @@ Namespace Methods.IDB.NewFile
Logger.Info("Rolling back transaction.") Logger.Info("Rolling back transaction.")
Transaction?.Rollback() Transaction?.Rollback()
Return New NewFile.VersionFileResponse(ex) Return New NewFile.NewFileResponse(ex)
End Try End Try
End Function End Function