Fix group file metadata and access
This commit is contained in:
@@ -933,6 +933,7 @@ func (a *adapter) TenantGroupFileCreate(id t.TenantID, file *t.GroupFile) (*t.Gr
|
||||
if file.IdempotencyKey == "" {
|
||||
file.IdempotencyKey = file.GroupFileID
|
||||
}
|
||||
a.enrichGroupFileFromUpload(id, file)
|
||||
now := t.TimeNow()
|
||||
ctx, cancel := a.getContext()
|
||||
if cancel != nil {
|
||||
@@ -941,7 +942,12 @@ func (a *adapter) TenantGroupFileCreate(id t.TenantID, file *t.GroupFile) (*t.Gr
|
||||
_, err := a.db.ExecContext(ctx, `INSERT INTO im_group_files
|
||||
(group_file_id,topic,file_id,source_topic,source_seq,uploader_id,file_name,mime_type,file_type,file_size,status,idempotency_key,created_at,updated_at)
|
||||
VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)
|
||||
ON DUPLICATE KEY UPDATE updated_at=updated_at`,
|
||||
ON DUPLICATE KEY UPDATE
|
||||
file_name=IF(file_name='', VALUES(file_name), file_name),
|
||||
mime_type=IF(mime_type='', VALUES(mime_type), mime_type),
|
||||
file_size=IF(file_size=0, VALUES(file_size), file_size),
|
||||
file_type=IF(file_type='' OR file_type='file', VALUES(file_type), file_type),
|
||||
updated_at=updated_at`,
|
||||
file.GroupFileID, file.Topic, file.FileID, file.SourceTopic, file.SourceSeq, decodeUID(file.UploaderID),
|
||||
file.FileName, file.MIMEType, file.FileType, file.FileSize, file.Status, file.IdempotencyKey, now, now)
|
||||
if err != nil && !isDupe(err) {
|
||||
@@ -950,6 +956,32 @@ func (a *adapter) TenantGroupFileCreate(id t.TenantID, file *t.GroupFile) (*t.Gr
|
||||
return a.groupFileByQuery(ctx, "SELECT * FROM im_group_files WHERE topic=? AND file_id=?", file.Topic, file.FileID)
|
||||
}
|
||||
|
||||
func (a *adapter) enrichGroupFileFromUpload(id t.TenantID, file *t.GroupFile) {
|
||||
if file == nil || t.ParseUid(file.FileID).IsZero() {
|
||||
return
|
||||
}
|
||||
fd, err := a.TenantFileGet(id, file.FileID)
|
||||
if err != nil || fd == nil {
|
||||
if file.FileName == "" {
|
||||
file.FileName = file.FileID
|
||||
}
|
||||
return
|
||||
}
|
||||
if file.MIMEType == "" {
|
||||
file.MIMEType = strings.TrimSpace(fd.MimeType)
|
||||
}
|
||||
if file.FileSize <= 0 {
|
||||
file.FileSize = fd.Size
|
||||
}
|
||||
if file.FileName == "" {
|
||||
if original := strings.TrimSpace(fd.OriginalName); original != "" {
|
||||
file.FileName = original
|
||||
} else {
|
||||
file.FileName = file.FileID
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (a *adapter) TenantGroupFileDelete(id t.TenantID, topic, groupFileID string, actor t.Uid, canManage bool, now time.Time) (*t.GroupFile, error) {
|
||||
if tenantAdp, err := a.routeGroupTenant(id); err != nil {
|
||||
return nil, err
|
||||
|
||||
Reference in New Issue
Block a user