mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-23 14:55:42 +00:00
Merge branch 'fix/path-s3' into 'development'
fix(BE): bug path s3 See merge request mbugroup/lti-api!270
This commit is contained in:
@@ -363,13 +363,19 @@ func (s *documentService) generateObjectKey(ext string) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
u := uuid.New().String()
|
u := uuid.New().String()
|
||||||
key := fmt.Sprintf("%s/%s%s", strings.Trim(s.keyPrefix, "/"), u, normalizedExt)
|
keyPrefix := strings.Trim(s.keyPrefix, "/")
|
||||||
if s.keyPrefix == "" {
|
key := fmt.Sprintf("%s%s", u, normalizedExt)
|
||||||
key = fmt.Sprintf("%s%s", u, normalizedExt)
|
if keyPrefix != "" {
|
||||||
|
key = fmt.Sprintf("%s/%s%s", keyPrefix, u, normalizedExt)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(key) > s.maxPathLength {
|
if len(key) > s.maxPathLength {
|
||||||
key = fmt.Sprintf("%s%s", u, normalizedExt)
|
compact := strings.ReplaceAll(u, "-", "")
|
||||||
|
if keyPrefix != "" {
|
||||||
|
key = fmt.Sprintf("%s/%s%s", keyPrefix, compact, normalizedExt)
|
||||||
|
} else {
|
||||||
|
key = fmt.Sprintf("%s%s", compact, normalizedExt)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(key) > s.maxPathLength {
|
if len(key) > s.maxPathLength {
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
BEGIN;
|
||||||
|
|
||||||
|
-- Migration: revert documents.path length
|
||||||
|
ALTER TABLE documents
|
||||||
|
ALTER COLUMN path TYPE VARCHAR(50);
|
||||||
|
|
||||||
|
COMMIT;
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
BEGIN;
|
||||||
|
|
||||||
|
-- Migration: extend documents.path length for environment prefixes
|
||||||
|
ALTER TABLE documents
|
||||||
|
ALTER COLUMN path TYPE VARCHAR(255);
|
||||||
|
|
||||||
|
COMMIT;
|
||||||
@@ -7,7 +7,7 @@ type Document struct {
|
|||||||
DocumentableType string `gorm:"size:50;not null;index:documents_documentable_polymorphic,priority:1"`
|
DocumentableType string `gorm:"size:50;not null;index:documents_documentable_polymorphic,priority:1"`
|
||||||
DocumentableId uint64 `gorm:"not null;index:documents_documentable_polymorphic,priority:2"`
|
DocumentableId uint64 `gorm:"not null;index:documents_documentable_polymorphic,priority:2"`
|
||||||
Type string `gorm:"size:50;not null"`
|
Type string `gorm:"size:50;not null"`
|
||||||
Path string `gorm:"size:50;not null"`
|
Path string `gorm:"size:255;not null"`
|
||||||
Name string `gorm:"size:50;not null"`
|
Name string `gorm:"size:50;not null"`
|
||||||
Ext string `gorm:"size:50;not null"`
|
Ext string `gorm:"size:50;not null"`
|
||||||
Size float64 `gorm:"type:numeric(15,3);not null"`
|
Size float64 `gorm:"type:numeric(15,3);not null"`
|
||||||
|
|||||||
Reference in New Issue
Block a user