tbc upload
This commit is contained in:
@@ -3,7 +3,6 @@ package file_attachment
|
||||
import (
|
||||
"mime/multipart"
|
||||
eru "simrs-vx/internal/domain/references/upload"
|
||||
|
||||
// internal - domain - base-entities
|
||||
ecore "simrs-vx/internal/domain/base-entities/core"
|
||||
|
||||
@@ -69,7 +68,7 @@ type ResponseDto struct {
|
||||
Name string `json:"name"`
|
||||
FilePath *string `json:"filePath"`
|
||||
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"`
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,6 @@ type FileAttachment struct {
|
||||
Name string `json:"name"`
|
||||
FilePath *string `json:"filePath"`
|
||||
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"`
|
||||
}
|
||||
|
||||
@@ -41,14 +41,22 @@ func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
|
||||
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{
|
||||
EntityType_Code: eru.EntityTypeCode(r.FormValue("entityType_code")),
|
||||
Ref_Id: refID,
|
||||
Type_Code: eru.UploadCode(r.FormValue("type_code")),
|
||||
Name: r.FormValue("name"),
|
||||
Upload_Employee_Id: &employeeIdStr,
|
||||
Upload_Employee_Id: employeeId,
|
||||
File: file,
|
||||
FileHeader: header,
|
||||
Filename: header.Filename,
|
||||
@@ -114,14 +122,22 @@ func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
|
||||
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{
|
||||
EntityType_Code: eru.EntityTypeCode(r.FormValue("entityType_code")),
|
||||
Ref_Id: refID,
|
||||
Type_Code: eru.UploadCode(r.FormValue("type_code")),
|
||||
Name: r.FormValue("name"),
|
||||
Upload_Employee_Id: &employeeIdStr,
|
||||
Upload_Employee_Id: employeeId,
|
||||
File: file,
|
||||
FileHeader: header,
|
||||
Filename: header.Filename,
|
||||
|
||||
@@ -49,7 +49,7 @@ func uploadAndGenerateFileUrl(input e.CreateDto, event *pl.Event) (string, error
|
||||
if !puh.IsValidFileType(ext, bucket) {
|
||||
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{
|
||||
BucketName: bucket,
|
||||
|
||||
Reference in New Issue
Block a user