PenaSide/verification
3
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'main'

Browse Source 
Dev

See merge request backend/verification!10
This commit is contained in:
Mikhail 2023-09-15 14:45:52 +00:00
commit 30f2a790e2
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
internal/controllers/verification.go
View File

@ -162,18 +162,31 @@ func (r *VerificationController) SetVerificationFile(c *fiber.Ctx) error {
} }
availableFiles := []string{"inn", "rule", "egrule", "certificate"} availableFiles := []string{"inn", "rule", "egrule", "certificate"}
var err error
var fileHeader *multipart.FileHeader
var result *models.Verification
for _, fileName := range availableFiles { for _, fileName := range availableFiles {
fileHeader, err := c.FormFile(fileName) fileHeader, err = c.FormFile(fileName)
if err != nil && !errors.Is(err, fasthttp.ErrMissingFile) { if errors.Is(err, fasthttp.ErrMissingFile) {
continue
}
if err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error()) return fiber.NewError(fiber.StatusInternalServerError, err.Error())
} }
if err := r.repository.UpdateFile(c.Context(), userID, fileName, fileHeader); err != nil { result, err = r.repository.UpdateFile(c.Context(), userID, fileName, fileHeader)
if err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error()) return fiber.NewError(fiber.StatusInternalServerError, err.Error())
} }
} }
err = r.telegram.SendVerification(result, true)
if err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error())
}
return c.SendStatus(fiber.StatusOK) return c.SendStatus(fiber.StatusOK)
} }

24
internal/repository/verification.go
View File

@ -255,26 +255,26 @@ func (r *VerificationRepository) Update(ctx context.Context, record *models.Veri
return &result, nil return &result, nil
} }
func (r *VerificationRepository) UpdateFile(ctx context.Context, userID, fileName string, fileHeader *multipart.FileHeader) error { func (r *VerificationRepository) UpdateFile(ctx context.Context, userID, fileName string, fileHeader *multipart.FileHeader) (*models.Verification, error) {
var err error var err error
// put file // put file
fileReader, err := fileHeader.Open() fileReader, err := fileHeader.Open()
if r.err(err) { if r.err(err) {
return err return nil, err
} }
_, err = r.s3.PutObject(ctx, VerificationBucket, fmt.Sprintf("%s/%s", userID, fileHeader.Filename), fileReader, fileHeader.Size, minio.PutObjectOptions{}) _, err = r.s3.PutObject(ctx, VerificationBucket, fmt.Sprintf("%s/%s", userID, fileHeader.Filename), fileReader, fileHeader.Size, minio.PutObjectOptions{})
if r.err(err) { if r.err(err) {
return err return nil, err
} }
fileUrl := fmt.Sprintf("%s/%s/%s/%s", VerificationEndpointURL, VerificationBucket, userID, fileHeader.Filename) fileURL := fmt.Sprintf("%s/%s/%s/%s", VerificationEndpointURL, VerificationBucket, userID, fileHeader.Filename)
// remove old file // remove old file
verification, err := r.GetByUserID(ctx, userID) verification, err := r.GetByUserID(ctx, userID)
if r.err(err) { if r.err(err) {
return err return nil, err
} }
found := false found := false
@ -283,26 +283,26 @@ func (r *VerificationRepository) UpdateFile(ctx context.Context, userID, fileNam
continue continue
} }
objectName := strings.ReplaceAll(file.Name, fmt.Sprintf("%v/%v/", VerificationEndpointURL, VerificationBucket), "") objectName := strings.ReplaceAll(file.Url, fmt.Sprintf("%v/%v/", VerificationEndpointURL, VerificationBucket), "")
if err = r.s3.RemoveObject(ctx, VerificationBucket, objectName, minio.RemoveObjectOptions{}); r.err(err) { if err = r.s3.RemoveObject(ctx, VerificationBucket, objectName, minio.RemoveObjectOptions{}); r.err(err) {
return err return nil, err
} }
verification.Files[iterator] = models.VerificationFile{Name: file.Name, Url: fileUrl} verification.Files[iterator] = models.VerificationFile{Name: file.Name, Url: fileURL}
found = true found = true
} }
if !found { if !found {
verification.Files = append(verification.Files, models.VerificationFile{Name: fileName, Url: fileUrl}) verification.Files = append(verification.Files, models.VerificationFile{Name: fileName, Url: fileURL})
} }
// update in mongodb // update in mongodb
_, err = r.Update(ctx, &models.Verification{ID: verification.ID, Files: verification.Files}) result, err := r.Update(ctx, &models.Verification{ID: verification.ID, Files: verification.Files})
if r.err(err) { if r.err(err) {
return err return nil, err
} }
return nil return result, nil
} }
func (r *VerificationRepository) err(err error) bool { func (r *VerificationRepository) err(err error) bool {