Mirrors/VILLASweb-backend-go
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web-backend-go/ synced 2025-03-30 00:00:12 +01:00
Code Issues Releases Wiki Activity

Merge branch 'fix-scenario-duplication' of https://git.rwth-aachen.de/acs/public/villas/web-backend-go into fix-scenario-duplication

Browse source
This commit is contained in:
irismarie 2021-10-15 13:04:03 +02:00
commit a78e70e78b
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
helper/amqp.go
View file

@ -270,8 +270,10 @@ func CheckConnection() error {
// WARNING: this only works with the kubernetes-simple manager of VILLAScontroller // WARNING: this only works with the kubernetes-simple manager of VILLAScontroller
func RequestICcreateAMQPsimpleManager(ic *database.InfrastructureComponent, managerUUID string, userName string) (string, error) { func RequestICcreateAMQPsimpleManager(ic *database.InfrastructureComponent, managerUUID string, userName string) (string, error) {
newUUID := uuid.New().String() newUUID := uuid.New().String()
log.Printf("New IC UUID: %s", newUUID)
var lastUpdate ICUpdateToCopy var lastUpdate ICUpdateToCopy
log.Println(ic.StatusUpdateRaw.RawMessage)
err := json.Unmarshal(ic.StatusUpdateRaw.RawMessage, &lastUpdate) err := json.Unmarshal(ic.StatusUpdateRaw.RawMessage, &lastUpdate)
if err != nil { if err != nil {
return newUUID, err return newUUID, err

14
routes/file/file_methods.go
View file

@ -227,11 +227,15 @@ func (f *File) Delete() error {
// delete file from s3 bucket // delete file from s3 bucket
if f.Key != "" { if f.Key != "" {
err = f.deleteS3() // TODO we do not delete the file from s3 object storage
if err != nil { // to ensure that no data is lost if multiple File objects reference the same S3 data object
return err // This behavior should be replaced by a different file handling in the future
} //err = f.deleteS3()
log.Println("Deleted file in S3 object storage") //if err != nil {
// return err
//}
//log.Println("Deleted file in S3 object storage")
log.Println("Did NOT delete file in S3 object storage!")
} }
err = db.Model(&so).Association("Files").Delete(f).Error err = db.Model(&so).Association("Files").Delete(f).Error