delete eg rule

This commit is contained in:
Pavel 2024-07-12 17:36:55 +03:00
parent 178b25e4f6
commit 5fbbbf281c
6 changed files with 14 additions and 48 deletions

@ -59,9 +59,6 @@ paths:
rule:
type: string
format: base64
egrule:
type: string
format: base64
certificate:
type: string
description: только для status == nko
@ -120,9 +117,6 @@ paths:
rule:
type: string
format: base64
egrule:
type: string
format: base64
certificate:
type: string
description: только для status == nko

@ -81,13 +81,6 @@ func (r *VerifyUserController) CreateVerification(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusBadRequest, "rule file required")
}
// EGRULE FILE
egruleFH, err := c.FormFile("egrule")
if err != nil || egruleFH.Size == 0 || egruleFH == nil {
return fiber.NewError(fiber.StatusBadRequest, "egrule file required")
}
// CERTIFICATE FILE
var certFH *multipart.FileHeader
if req.Status == "nko" {
@ -104,7 +97,7 @@ func (r *VerifyUserController) CreateVerification(c *fiber.Ctx) error {
Accepted: false,
Status: req.Status,
Comment: "",
}, innFH, ruleFH, egruleFH, certFH)
}, innFH, ruleFH, certFH)
if err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error())
}
@ -131,7 +124,7 @@ func (r *VerifyUserController) SetVerificationFile(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusUnauthorized)
}
availableFiles := []string{"inn", "rule", "egrule", "certificate"}
availableFiles := []string{"inn", "rule", "certificate"}
var err error
var fileHeader *multipart.FileHeader
var result *models.Verification

@ -43,7 +43,7 @@ func (r *VerificationRepository) Insert(
ctx context.Context,
userID string,
record *models.Verification,
innFH, ruleFH, egruleFH, certFH *multipart.FileHeader) (*models.Verification, error) {
innFH, ruleFH, certFH *multipart.FileHeader) (*models.Verification, error) {
now := time.Now()
record.ID = primitive.NewObjectIDFromTimestamp(now).Hex()
record.UpdatedAt = now
@ -70,17 +70,6 @@ func (r *VerificationRepository) Insert(
return nil, err
}
// Put egrule file
egrule, err := egruleFH.Open()
if r.err(err) {
return nil, err
}
_, err = r.s3.PutObject(ctx, VerificationBucket, fmt.Sprintf("%s/%s/%s", r.folder, userID, egruleFH.Filename), egrule, egruleFH.Size, minio.PutObjectOptions{})
if r.err(err) {
return nil, err
}
// Put certificate file
if certFH != nil {
cert, err := certFH.Open()
@ -111,10 +100,6 @@ func (r *VerificationRepository) Insert(
Name: "rule",
Url: fmt.Sprintf("%s/%s/%s/%s", r.url, r.folder, userID, ruleFH.Filename),
},
{
Name: "egrule",
Url: fmt.Sprintf("%s/%s/%s/%s", r.url,r.folder, userID, egruleFH.Filename),
},
}...)
result, err := r.mongo.InsertOne(ctx, record)

@ -61,10 +61,6 @@ paths:
type: file
contentMediaType: application/pdf
contentEncoding: base64
egrule:
type: file
contentMediaType: application/pdf
contentEncoding: base64
certificate:
type: file
description: только для status == nko

@ -33,7 +33,6 @@ func Test_SetVerify(t *testing.T) {
}{
{"inn", "files/inn"},
{"rule", "files/rule"},
{"egrule", "files/egrule"},
{"certificate", "files/certificate"},
}
for _, file := range files {

@ -32,7 +32,6 @@ func Test_PutFile(t *testing.T) {
}{
{"inn", "files/inn"},
{"rule", "files/rule"},
{"egrule", "files/egrule"},
{"certificate", "files/certificate"},
}
for _, file := range files {