tbc upload

This commit is contained in:
vanilia
2025-11-11 15:56:55 +07:00
5 changed files with 25 additions and 10 deletions

No files matched your search

+2 -2
View File
@@ -1,4 +1,4 @@
h1:l9TShSJKxWO7Ag2+PYB7DcVDd3pz/M2Sm0hpZYpUNBA= h1:/ysf2SIdpKcuSzvAPNWONxzu08MCf8eE5krteU4Chas=
20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k= 20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k=
20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0= 20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0=
20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI= 20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI=
@@ -108,4 +108,4 @@ h1:l9TShSJKxWO7Ag2+PYB7DcVDd3pz/M2Sm0hpZYpUNBA=
20251110093522.sql h1:nsz8jCxGjEdr/bz9g+4ozfZzIP803xONjVmucad1GMc= 20251110093522.sql h1:nsz8jCxGjEdr/bz9g+4ozfZzIP803xONjVmucad1GMc=
20251110100258.sql h1:IBqt1VZj5WjQ+l9aAFGHOCCBtzb03KlLLihFLut7itg= 20251110100258.sql h1:IBqt1VZj5WjQ+l9aAFGHOCCBtzb03KlLLihFLut7itg=
20251110100545.sql h1:6/LV7751iyKxE2xI6vO1zly+aHUwxXD/IBwLcVpKxqM= 20251110100545.sql h1:6/LV7751iyKxE2xI6vO1zly+aHUwxXD/IBwLcVpKxqM=
20251111040358.sql h1:dbHqvkf0FWQVGpmTQAY0bdx6v2cXAxrPSH5byP0r/eU= 20251111040358.sql h1:c/RQSoA8yZl7cAcOv7n1RchmudPj7LdL3PEBdNvCUrA=
@@ -3,7 +3,6 @@ package file_attachment
import ( import (
"mime/multipart" "mime/multipart"
eru "simrs-vx/internal/domain/references/upload" eru "simrs-vx/internal/domain/references/upload"
// internal - domain - base-entities // internal - domain - base-entities
ecore "simrs-vx/internal/domain/base-entities/core" ecore "simrs-vx/internal/domain/base-entities/core"
@@ -69,7 +68,7 @@ type ResponseDto struct {
Name string `json:"name"` Name string `json:"name"`
FilePath *string `json:"filePath"` FilePath *string `json:"filePath"`
FileName *string `json:"fileName"` FileName *string `json:"fileName"`
Upload_Employee_Id *string `json:"upload_employee_id"` Upload_Employee_Id *uint `json:"upload_employee_id"`
Upload_Employee *ee.Employee `json:"upload_employee,omitempty"` Upload_Employee *ee.Employee `json:"upload_employee,omitempty"`
} }
@@ -14,6 +14,6 @@ type FileAttachment struct {
Name string `json:"name"` Name string `json:"name"`
FilePath *string `json:"filePath"` FilePath *string `json:"filePath"`
FileName *string `json:"fileName"` FileName *string `json:"fileName"`
Upload_Employee_Id *string `json:"upload_employee_id"` Upload_Employee_Id *uint `json:"upload_employee_id"`
Upload_Employee *ee.Employee `json:"upload_employee,omitempty" gorm:"foreignKey:Upload_Employee_Id;references:Id"` Upload_Employee *ee.Employee `json:"upload_employee,omitempty" gorm:"foreignKey:Upload_Employee_Id;references:Id"`
} }
@@ -41,14 +41,22 @@ func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
refID = &id refID = &id
} }
} }
employeeIdStr := r.FormValue("employee_id")
employeeIdStr := r.FormValue("upload_employee_id")
var employeeId *uint
if employeeIdStr != "" {
if id64, err := strconv.ParseUint(employeeIdStr, 10, 32); err == nil {
id := uint(id64)
employeeId = &id
}
}
dto := e.CreateDto{ dto := e.CreateDto{
EntityType_Code: eru.EntityTypeCode(r.FormValue("entityType_code")), EntityType_Code: eru.EntityTypeCode(r.FormValue("entityType_code")),
Ref_Id: refID, Ref_Id: refID,
Type_Code: eru.UploadCode(r.FormValue("type_code")), Type_Code: eru.UploadCode(r.FormValue("type_code")),
Name: r.FormValue("name"), Name: r.FormValue("name"),
Upload_Employee_Id: &employeeIdStr, Upload_Employee_Id: employeeId,
File: file, File: file,
FileHeader: header, FileHeader: header,
Filename: header.Filename, Filename: header.Filename,
@@ -114,14 +122,22 @@ func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
refID = &id refID = &id
} }
} }
employeeIdStr := r.FormValue("employee_id")
employeeIdStr := r.FormValue("upload_employee_id")
var employeeId *uint
if employeeIdStr != "" {
if id64, err := strconv.ParseUint(employeeIdStr, 10, 32); err == nil {
id := uint(id64)
employeeId = &id
}
}
dto := e.CreateDto{ dto := e.CreateDto{
EntityType_Code: eru.EntityTypeCode(r.FormValue("entityType_code")), EntityType_Code: eru.EntityTypeCode(r.FormValue("entityType_code")),
Ref_Id: refID, Ref_Id: refID,
Type_Code: eru.UploadCode(r.FormValue("type_code")), Type_Code: eru.UploadCode(r.FormValue("type_code")),
Name: r.FormValue("name"), Name: r.FormValue("name"),
Upload_Employee_Id: &employeeIdStr, Upload_Employee_Id: employeeId,
File: file, File: file,
FileHeader: header, FileHeader: header,
Filename: header.Filename, Filename: header.Filename,
@@ -49,7 +49,7 @@ func uploadAndGenerateFileUrl(input e.CreateDto, event *pl.Event) (string, error
if !puh.IsValidFileType(ext, bucket) { if !puh.IsValidFileType(ext, bucket) {
return "", fmt.Errorf("invalid file type: %s", input.Filename) return "", fmt.Errorf("invalid file type: %s", input.Filename)
} }
objectName := fmt.Sprintf("%s%s%s%d%s", input.EntityType_Code, input.Ref_Id, input.Type_Code, time.Now().UnixNano(), ext) objectName := fmt.Sprintf("%s%d%s", input.Type_Code, time.Now().UnixNano(), ext)
uploadInput := pmh.UploadReaderInput{ uploadInput := pmh.UploadReaderInput{
BucketName: bucket, BucketName: bucket,