Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func UploadAttachmentDetailDO2DTO(do *entity.UploadAttachmentDetail) *app_eval_s
if do == nil {
return nil
}
return &app_eval_set.UploadAttachmentDetail{
dto := &app_eval_set.UploadAttachmentDetail{
ContentType: contentTypeDO2DTO(do.ContentType),
ImagexServiceID: do.ImagexServiceID,
OriginImage: common.ConvertImageDO2DTO(do.OriginImage),
Expand All @@ -146,8 +146,11 @@ func UploadAttachmentDetailDO2DTO(do *entity.UploadAttachmentDetail) *app_eval_s
OriginVideo: common.ConvertVideoDO2DTO(do.OriginVideo),
Video: common.ConvertVideoDO2DTO(do.Video),
ErrMsg: do.ErrMsg,
ErrorType: gptr.Of(dataset.ItemErrorType(gptr.Indirect(do.ErrorType))),
}
if do.ErrorType != nil {
dto.ErrorType = gptr.Of(dataset.ItemErrorType(gptr.Indirect(do.ErrorType)))
}
return dto
}

func contentTypeDO2DTO(ct *entity.ContentType) *dataset.ContentType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,54 +294,45 @@ func TestUploadAttachmentDetailDO2DTO(t *testing.T) {
input: &entity.UploadAttachmentDetail{ContentType: gptr.Of(entity.ContentTypeText)},
expected: &app_eval_set.UploadAttachmentDetail{
ContentType: gptr.Of(dataset.ContentType_Text),
ErrorType: gptr.Of(dataset.ItemErrorType(0)),
},
},
{
name: "image content type",
input: &entity.UploadAttachmentDetail{ContentType: gptr.Of(entity.ContentTypeImage)},
expected: &app_eval_set.UploadAttachmentDetail{
ContentType: gptr.Of(dataset.ContentType_Image),
ErrorType: gptr.Of(dataset.ItemErrorType(0)),
},
},
{
name: "audio content type",
input: &entity.UploadAttachmentDetail{ContentType: gptr.Of(entity.ContentTypeAudio)},
expected: &app_eval_set.UploadAttachmentDetail{
ContentType: gptr.Of(dataset.ContentType_Audio),
ErrorType: gptr.Of(dataset.ItemErrorType(0)),
},
},
{
name: "video content type",
input: &entity.UploadAttachmentDetail{ContentType: gptr.Of(entity.ContentTypeVideo)},
expected: &app_eval_set.UploadAttachmentDetail{
ContentType: gptr.Of(dataset.ContentType_Video),
ErrorType: gptr.Of(dataset.ItemErrorType(0)),
},
},
{
name: "multipart content type",
input: &entity.UploadAttachmentDetail{ContentType: gptr.Of(entity.ContentTypeMultipart)},
expected: &app_eval_set.UploadAttachmentDetail{
ContentType: gptr.Of(dataset.ContentType_MultiPart),
ErrorType: gptr.Of(dataset.ItemErrorType(0)),
},
},
{
name: "unknown content type",
input: &entity.UploadAttachmentDetail{ContentType: gptr.Of(entity.ContentType("unknown"))},
expected: &app_eval_set.UploadAttachmentDetail{
ErrorType: gptr.Of(dataset.ItemErrorType(0)),
},
name: "unknown content type",
input: &entity.UploadAttachmentDetail{ContentType: gptr.Of(entity.ContentType("unknown"))},
expected: &app_eval_set.UploadAttachmentDetail{},
},
{
name: "nil content type",
input: &entity.UploadAttachmentDetail{},
expected: &app_eval_set.UploadAttachmentDetail{
ErrorType: gptr.Of(dataset.ItemErrorType(0)),
},
name: "nil content type",
input: &entity.UploadAttachmentDetail{},
expected: &app_eval_set.UploadAttachmentDetail{},
},
{
name: "full fields",
Expand Down
Loading