medol
/
medol-be
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: update for upload file in ppid data files and fixing response

This commit is contained in:
hanif salafi 2024-05-29 11:46:00 +07:00
parent c3946bdd81
commit d828aba813
16 changed files with 208 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/database/entity/ppid_data_categories.entity.go
View File

@ -10,6 +10,7 @@ type PpidDataCategories struct {
ParentId *uint `json:"parent_id" gorm:"type:int4"`
Position *int `json:"position" gorm:"type:int4"`
ThumbnailPath *string `json:"thumbnail_path" gorm:"type:varchar"`
ThumbnailUrl *string `json:"thumbnail_url" gorm:"type:varchar"`
IsActive *bool `json:"is_active" gorm:"type:bool;default:true"`
CreatedAt time.Time `json:"created_at" gorm:"default:now()"`
UpdatedAt time.Time `json:"updated_at" gorm:"default:now()"`

1
app/database/entity/ppid_data_files.entity.go
View File

@ -6,6 +6,7 @@ type PpidDataFiles struct {
ID uint `json:"id" gorm:"primaryKey;type:int4;autoIncrement"`
PpidDataId int `json:"ppid_data_id" gorm:"type:int4"`
Title *string `json:"title" gorm:"type:varchar"`
Type *string `json:"type" gorm:"type:varchar"`
FileType *string `json:"file_type" gorm:"type:varchar"`
FileName *string `json:"file_name" gorm:"type:varchar"`
FilePath *string `json:"file_path" gorm:"type:varchar"`

5
app/module/ppid_data_categories/mapper/ppid_data_categories.mapper.go
View File

@ -12,7 +12,6 @@ import (
"go-humas-be/app/module/ppid_datas/response"
usersRepository "go-humas-be/app/module/users/repository"
"go-humas-be/utils/paginator"
"strconv"
)
func PpidDataCategoriesResponseMapper(ppidDataCategoriesReq *entity.PpidDataCategories, childPpidDataCategoriesReq []*entity.PpidDataCategories) (ppidDataCategoriesRes *res.PpidDataCategoriesResponse) {
@ -31,7 +30,7 @@ func PpidDataCategoriesResponseMapper(ppidDataCategoriesReq *entity.PpidDataCate
Slug: ppidDataCategoriesReq.Slug,
ParentId: ppidDataCategoriesReq.ParentId,
Position: ppidDataCategoriesReq.Position,
ThumbnailUrl: "/ppid-data-categories/thumbnail/viewer/" + strconv.Itoa(int(ppidDataCategoriesReq.ID)),
ThumbnailUrl: ppidDataCategoriesReq.ThumbnailUrl,
IsActive: ppidDataCategoriesReq.IsActive,
CreatedAt: ppidDataCategoriesReq.CreatedAt,
UpdatedAt: ppidDataCategoriesReq.UpdatedAt,
@ -76,7 +75,7 @@ func PpidDataCategoriesWithPpidDataResponseMapper(
Slug: ppidDataCategoriesReq.Slug,
ParentId: ppidDataCategoriesReq.ParentId,
Position: ppidDataCategoriesReq.Position,
ThumbnailUrl: "/ppid-data-categories/thumbnail/viewer/" + strconv.Itoa(int(ppidDataCategoriesReq.ID)),
ThumbnailUrl: ppidDataCategoriesReq.ThumbnailUrl,
IsActive: ppidDataCategoriesReq.IsActive,
CreatedAt: ppidDataCategoriesReq.CreatedAt,
UpdatedAt: ppidDataCategoriesReq.UpdatedAt,

4
app/module/ppid_data_categories/response/ppid_data_categories.response.go
View File

@ -12,7 +12,7 @@ type PpidDataCategoriesResponse struct {
Slug string `json:"slug"`
ParentId *uint `json:"parentId"`
Position *int `json:"position"`
ThumbnailUrl string `json:"thumbnailUrl"`
ThumbnailUrl *string `json:"thumbnailUrl"`
IsActive *bool `json:"isActive"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
@ -27,7 +27,7 @@ type PpidDataCategoriesWithPpidDataResponse struct {
Slug string `json:"slug"`
ParentId *uint `json:"parentId"`
Position *int `json:"position"`
ThumbnailUrl string `json:"thumbnailUrl"`
ThumbnailUrl *string `json:"thumbnailUrl"`
IsActive *bool `json:"isActive"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`

17
app/module/ppid_data_categories/service/ppid_data_categories.service.go
View File

@ -13,7 +13,7 @@ import (
ppidDataFilesRepository "go-humas-be/app/module/ppid_data_files/repository"
ppidDatasRepository "go-humas-be/app/module/ppid_datas/repository"
usersRepository "go-humas-be/app/module/users/repository"
minioStorage "go-humas-be/config/config"
config "go-humas-be/config/config"
"go-humas-be/utils/paginator"
"io"
"log"
@ -31,8 +31,9 @@ type ppidDataCategoriesService struct {
PpidDatasRepo ppidDatasRepository.PpidDatasRepository
PpidDataFilesRepo ppidDataFilesRepository.PpidDataFilesRepository
UsersRepo usersRepository.UsersRepository
MinioStorage *minioStorage.MinioStorage
MinioStorage *config.MinioStorage
Log zerolog.Logger
Cfg *config.Config
}
// PpidDataCategoriesService define interface of IPpidDataCategoriesService
@ -55,8 +56,9 @@ func NewPpidDataCategoriesService(
ppidDatasRepo ppidDatasRepository.PpidDatasRepository,
ppidDataFilesRepo ppidDataFilesRepository.PpidDataFilesRepository,
usersRepo usersRepository.UsersRepository,
minioStorage *minioStorage.MinioStorage,
minioStorage *config.MinioStorage,
log zerolog.Logger,
cfg *config.Config,
) PpidDataCategoriesService {
return &ppidDataCategoriesService{
@ -66,6 +68,7 @@ func NewPpidDataCategoriesService(
UsersRepo: usersRepo,
MinioStorage: minioStorage,
Log: log,
Cfg: cfg,
}
}
@ -159,6 +162,9 @@ func (_i *ppidDataCategoriesService) SaveThumbnail(c *fiber.Ctx) (err error) {
return err
}
host := _i.Cfg.App.Host
port := _i.Cfg.App.ExternalPort
_i.Log.Info().Str("timestamp", time.Now().
Format(time.RFC3339)).Str("Service:SaveThumbnail", "Categories:SaveThumbnail").
Interface("id", id).Msg("")
@ -207,7 +213,12 @@ func (_i *ppidDataCategoriesService) SaveThumbnail(c *fiber.Ctx) (err error) {
objectName := "ppid/category/thumbnail/" + newFilename
findCategory, err := _i.Repo.FindOne(uint(id))
thumbnailUrl := host + port + "/ppid-data-categories/thumbnail/viewer/" + strconv.Itoa(int(id))
findCategory.ThumbnailPath = &objectName
findCategory.ThumbnailUrl = &thumbnailUrl
err = _i.Repo.Update(uint(id), findCategory)
if err != nil {
return err

5
app/module/ppid_data_files/controller/ppid_data_files.controller.go
View File

@ -111,7 +111,10 @@ func (_i *ppidDataFilesController) Show(c *fiber.Ctx) error {
// @Tags PPID Files
// @Security Bearer
// @Produce json
// @Param files formData file true "Upload file"
// @Param types formData string false "Types"
// @Param positions formData string false "Positions"
// @Param urls formData string false "Upload Url"
// @Param files formData file false "Upload File"
// @Param ppidDataId path int true "Ppid Data ID"
// @Success 200 {object} response.Response
// @Failure 400 {object} response.BadRequestError

8
app/module/ppid_data_files/mapper/ppid_data_files.mapper.go
View File

@ -6,16 +6,14 @@ import (
)
func PpidDataFilesResponseMapper(ppidDataFilesReq *entity.PpidDataFiles) (ppidDataFilesRes *res.PpidDataFilesResponse) {
fileUrl := "/ppid-data-files/viewer/"
if ppidDataFilesReq.FileName != nil {
fileUrl += *ppidDataFilesReq.FileName
}
if ppidDataFilesReq != nil {
ppidDataFilesRes = &res.PpidDataFilesResponse{
ID: ppidDataFilesReq.ID,
Title: ppidDataFilesReq.Title,
Type: ppidDataFilesReq.Type,
PpidDataId: ppidDataFilesReq.PpidDataId,
FileUrl: fileUrl,
FileName: ppidDataFilesReq.FileName,
FileUrl: ppidDataFilesReq.FileUrl,
FileType: ppidDataFilesReq.FileType,
DownloadCount: ppidDataFilesReq.DownloadCount,
Position: ppidDataFilesReq.Position,

8
app/module/ppid_data_files/request/ppid_data_files.request.go
View File

@ -24,10 +24,13 @@ type PpidDataFilesQueryRequest struct {
type PpidDataFilesCreateRequest struct {
PpidDataId int `json:"ppidDataId" validate:"required"`
Title *string `json:"title" validate:"required"`
Title *string `json:"title"`
Type *string `json:"type"`
Position *int `json:"position"`
FileType *string `json:"fileType"`
FileName *string `json:"fileName"`
FilePath *string `json:"filePath"`
FileUrl *string `json:"fileUrl"`
Size *string `json:"size"`
CreatedById *int `json:"createdById"`
StatusId *int `json:"statusId"`
@ -36,10 +39,13 @@ type PpidDataFilesCreateRequest struct {
func (req PpidDataFilesCreateRequest) ToEntity() *entity.PpidDataFiles {
return &entity.PpidDataFiles{
Title: req.Title,
Type: req.Type,
Position: req.Position,
PpidDataId: req.PpidDataId,
FileType: req.FileType,
FileName: req.FileName,
FilePath: req.FilePath,
FileUrl: req.FileUrl,
Size: req.Size,
CreatedById: req.CreatedById,
StatusId: req.StatusId,

5
app/module/ppid_data_files/response/ppid_data_files.response.go
View File

@ -5,10 +5,11 @@ import "time"
type PpidDataFilesResponse struct {
ID uint `json:"id"`
Title *string `json:"title"`
Type *string `json:"type"`
PpidDataId int `json:"ppidDataId"`
FileName uint `json:"fileName"`
FileName *string `json:"fileName"`
FileType *string `json:"fileType"`
FileUrl string `json:"fileUrl"`
FileUrl *string `json:"fileUrl"`
DownloadCount *int `json:"downloadCount"`
CreatedById *int `json:"createdById"`
Position *int `json:"position"`

93
app/module/ppid_data_files/service/ppid_data_files.service.go
View File

@ -10,12 +10,13 @@ import (
"go-humas-be/app/module/ppid_data_files/repository"
"go-humas-be/app/module/ppid_data_files/request"
"go-humas-be/app/module/ppid_data_files/response"
minioStorage "go-humas-be/config/config"
config "go-humas-be/config/config"
"go-humas-be/utils/paginator"
"io"
"log"
"math/rand"
"mime"
"path"
"path/filepath"
"strconv"
"strings"
@ -26,7 +27,8 @@ import (
type ppidDataFilesService struct {
Repo repository.PpidDataFilesRepository
Log zerolog.Logger
MinioStorage *minioStorage.MinioStorage
MinioStorage *config.MinioStorage
Cfg *config.Config
}
// PpidDataFilesService define interface of IPpidDataFilesService
@ -41,12 +43,13 @@ type PpidDataFilesService interface {
}
// NewPpidDataFilesService init PpidDataFilesService
func NewPpidDataFilesService(repo repository.PpidDataFilesRepository, log zerolog.Logger, minioStorage *minioStorage.MinioStorage) PpidDataFilesService {
func NewPpidDataFilesService(repo repository.PpidDataFilesRepository, log zerolog.Logger, minioStorage *config.MinioStorage, cfg *config.Config) PpidDataFilesService {
return &ppidDataFilesService{
Repo: repo,
Log: log,
MinioStorage: minioStorage,
Cfg: cfg,
}
}
@ -80,13 +83,64 @@ func (_i *ppidDataFilesService) Save(c *fiber.Ctx) (err error) {
return err
}
bucketName := _i.MinioStorage.Cfg.ObjectStorage.MinioStorage.BucketName
host := _i.Cfg.App.Host
port := _i.Cfg.App.ExternalPort
form, err := c.MultipartForm()
_i.Log.Info().Str("timestamp", time.Now().
Format(time.RFC3339)).Str("Service", "Save").
Interface("form", form).Msg("")
typesString := form.Value["types"]
types := strings.Split(typesString[0], ",")
positionsString := form.Value["positions"]
positions := strings.Split(positionsString[0], ",")
urlsString := form.Value["urls"]
urls := strings.Split(urlsString[0], ",")
files := form.File["files"]
fileCounter := 0
urlCounter := 0
_i.Log.Info().Str("timestamp", time.Now().
Format(time.RFC3339)).Str("Service", "Save").
Interface("form", types).Msg("")
for index, fileType := range types {
position := &positions[index]
positionInt64, err := strconv.ParseInt(*position, 10, 0)
if err != nil {
return err
}
files := form.File["files"]
positionInt := int(positionInt64)
statusId := 1
req := request.PpidDataFilesCreateRequest{
PpidDataId: int(id),
Type: &fileType,
Position: &positionInt,
StatusId: &statusId,
}
_i.Log.Info().Str("timestamp", time.Now().
Format(time.RFC3339)).Str("Service", "Save").
Interface("request", req).Msg("")
if fileType == "url" {
url := urls[urlCounter]
filename := path.Base(url)
filenameWithoutExt := filepath.Clean(filename[:len(filename)-len(filepath.Ext(filename))])
extension := filepath.Ext(filename)[1:]
title := strings.ReplaceAll(filenameWithoutExt, "-", " ")
req.Title = &title
req.FileType = &extension
req.FileName = &filename
req.FileUrl = &url
urlCounter += 1
} else {
bucketName := _i.MinioStorage.Cfg.ObjectStorage.MinioStorage.BucketName
// Create minio connection.
minioClient, err := _i.MinioStorage.ConnectMinio()
@ -99,7 +153,7 @@ func (_i *ppidDataFilesService) Save(c *fiber.Ctx) (err error) {
}
// Iterasi semua file yang diunggah
for _, file := range files {
file := files[fileCounter]
_i.Log.Info().Str("timestamp", time.Now().
Format(time.RFC3339)).Str("Service:Resource", "Uploader:: loop1").
@ -124,25 +178,26 @@ func (_i *ppidDataFilesService) Save(c *fiber.Ctx) (err error) {
objectName := "ppid/upload/" + newFilename
size := strconv.FormatInt(file.Size, 10)
statusId := 1
fileUrl := "/ppid-data-files/viewer/"
fileUrl += host + port + newFilename
req := request.PpidDataFilesCreateRequest{
PpidDataId: int(id),
Title: &newFilenameWithoutExt,
FileType: &extension,
FileName: &newFilename,
FilePath: &objectName,
Size: &size,
StatusId: &statusId,
}
req.Title = &newFilenameWithoutExt
req.FileType = &extension
req.FileName = &newFilename
req.FilePath = &objectName
req.FileUrl = &fileUrl
req.Size = &size
err = _i.Repo.Create(req.ToEntity())
// Upload file to MinIO
_, err = minioClient.PutObject(context.Background(), bucketName, objectName, src, file.Size, minio.PutObjectOptions{})
if err != nil {
return err
}
// Upload file ke MinIO
_, err = minioClient.PutObject(context.Background(), bucketName, objectName, src, file.Size, minio.PutObjectOptions{})
fileCounter += 1
}
err = _i.Repo.Create(req.ToEntity())
if err != nil {
return err
}

2
app/module/ppid_datas/controller/ppid_datas.controller.go
View File

@ -112,7 +112,7 @@ func (_i *ppidDatasController) Show(c *fiber.Ctx) error {
// @Description API for create PpidDatas
// @Tags PPID Data
// @Security Bearer
// @Param Authorization header string true "Insert your access token" default(Bearer <Add access token here>)
// @Param Authorization header string true "Insert your access token" default (Bearer <Add access token here>)
// @Param payload body request.PpidDatasCreateRequest true "Required payload"
// @Success 200 {object} response.Response
// @Failure 400 {object} response.BadRequestError

2
config/config/index.config.go
View File

@ -15,7 +15,9 @@ import (
type app = struct {
Name string `toml:"name"`
Host string `toml:"host"`
Port string `toml:"port"`
ExternalPort string `toml:"external-port"`
PrintRoutes bool `toml:"print-routes"`
Prefork bool `toml:"prefork"`
Production bool `toml:"production"`

4
config/toml/config.toml
View File

@ -1,7 +1,9 @@
# Configuration vars for cmd/app
[app]
name = "Fiber starter"
host = "http://103.82.242.92"
port = ":8800"
external-port = ":8888"
idle-timeout = 5 # As seconds
print-routes = false
prefork = true
@ -10,7 +12,7 @@ body-limit = 104857600 # "100 * 1024 * 1024"
[db.postgres]
dsn = "postgresql://humas_polri:P@ssw0rd.1@103.82.242.92:5432/humas_polri" # <driver>://<username>:<password>@<host>:<port>/<database>
migrate = false
migrate = true
seed = false
[logger]

24
docs/swagger/docs.go
View File

@ -4521,12 +4521,29 @@ const docTemplate = `{
],
"summary": "Create PpidDataFiles",
"parameters": [
{
"type": "string",
"description": "Types",
"name": "types",
"in": "formData"
},
{
"type": "string",
"description": "Positions",
"name": "positions",
"in": "formData"
},
{
"type": "string",
"description": "Upload Url",
"name": "urls",
"in": "formData"
},
{
"type": "file",
"description": "Upload file",
"description": "Upload File",
"name": "files",
"in": "formData",
"required": true
"in": "formData"
},
{
"type": "integer",
@ -4717,7 +4734,6 @@ const docTemplate = `{
"parameters": [
{
"type": "string",
"default": "Bearer \u003cAdd access token here\u003e",
"description": "Insert your access token",
"name": "Authorization",
"in": "header",

24
docs/swagger/swagger.json
View File

@ -4510,12 +4510,29 @@
],
"summary": "Create PpidDataFiles",
"parameters": [
{
"type": "string",
"description": "Types",
"name": "types",
"in": "formData"
},
{
"type": "string",
"description": "Positions",
"name": "positions",
"in": "formData"
},
{
"type": "string",
"description": "Upload Url",
"name": "urls",
"in": "formData"
},
{
"type": "file",
"description": "Upload file",
"description": "Upload File",
"name": "files",
"in": "formData",
"required": true
"in": "formData"
},
{
"type": "integer",
@ -4706,7 +4723,6 @@
"parameters": [
{
"type": "string",
"default": "Bearer \u003cAdd access token here\u003e",
"description": "Insert your access token",
"name": "Authorization",
"in": "header",

18
docs/swagger/swagger.yaml
View File

@ -3445,10 +3445,21 @@ paths:
post:
description: API for create PpidDataFiles
parameters:
- description: Upload file
- description: Types
in: formData
name: types
type: string
- description: Positions
in: formData
name: positions
type: string
- description: Upload Url
in: formData
name: urls
type: string
- description: Upload File
in: formData
name: files
required: true
type: file
- description: Ppid Data ID
in: path
@ -3631,8 +3642,7 @@ paths:
post:
description: API for create PpidDatas
parameters:
- default: Bearer <Add access token here>
description: Insert your access token
- description: Insert your access token
in: header
name: Authorization
required: true