Skip to content

Commit

Permalink
refactor: move credits to config
Browse files Browse the repository at this point in the history
  • Loading branch information
grigorevmp committed Dec 8, 2022
1 parent fffcd41 commit a0073a6
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 28 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*tmp/
/areas/backend/storage/*
/areas/backend/repository/cache/*
/areas/backend/config.py

.idea

Expand Down
26 changes: 11 additions & 15 deletions areas/backend/repository/data_store_storage_repository.py
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
import base64
from io import BytesIO

import os
import shutil
import uuid
from io import BytesIO
from typing import BinaryIO, Optional
import shutil

from sqlalchemy import update
from flask import current_app
from minio import Minio
from sqlalchemy import delete
from sqlalchemy import update

from app_db import get_current_db
from app_state import ServerDatabase
from app_states_for_test import ScopeTypeEnum
from config import *
from core.accesses import BaseAccess, UrlAccess, AccessType, DepartmentAccess, UserAccess
from core.base_storage_item import BaseStorageItem
from core.directory import Directory
from core.files import File
from core.space_manager import SpaceManager
from core.user_cloud_space import UserCloudSpace, SpaceType
from flask import current_app
from app_db import get_current_db

from minio import Minio

from database.users.user_model import FileModel, UserModel, UserSpaceModel, DirectoryModel, AccessModel, FileDirectory


Expand All @@ -33,13 +31,12 @@ def __init__(self, server_state: ServerDatabase):
self.db = get_current_db(current_app)
self.minio_client = DataStoreStorageRepository.get_minio_client()


@staticmethod
def get_minio_client():
client = Minio(
"play.min.io",
access_key="Q3AM3UQ867SPQQA43P2F",
secret_key="zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG",
endpoint=endpoint,
access_key=access_key,
secret_key=secret_key,
)

found = client.bucket_exists("cloudstorage")
Expand Down Expand Up @@ -108,7 +105,7 @@ def add_new_directory(self, new_directory: Directory, parent_id: uuid.UUID) -> u
id=str(new_directory.get_id()),
name=new_directory.get_name(),
)

parent_directory = DirectoryModel.query.filter_by(id=str(parent_id)).first()
parent_directory.inner_directories.append(new_directory_model)

Expand Down Expand Up @@ -209,7 +206,6 @@ def copy_file(self, file, directory_id):
directory_id=str(directory_id)
)


file_name = f'{old_file_model.id}{old_file_model.type}'
new_file_name = f'{str(new_id)}{old_file_model.type}'
file_data = self.get_binary_file_by_id(old_file_model.id, old_file_model.type)
Expand Down
14 changes: 8 additions & 6 deletions areas/backend/tests/test_cc/test_copy.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import pytest
from minio import Minio

from config import *


class TestCopyController:

Expand All @@ -15,9 +17,9 @@ def test_copy_file(self, app_client_user):
_id = response.json['id']
response = app_client_user.post(path=f'/copy/{_id}?target_directory=abd9cd7f-9ffd-42b0-bce4-eb14b51a1fd1')
client = Minio(
"play.min.io",
access_key="Q3AM3UQ867SPQQA43P2F",
secret_key="zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG",
endpoint=endpoint,
access_key=access_key,
secret_key=secret_key,
)
client.remove_object("cloudstorage", f"{_id}.jpeg")
assert response.status_code == 200
Expand All @@ -34,9 +36,9 @@ def test_copy_directory(self, app_client_user):
response = app_client_user.post(path='/copy/abd9cd7f-9ffd-42b0-bce4-eb14b51a1f09'
'?target_directory=abd9cd7f-9ffd-42b0-bce4-eb14b51a1fd1')
client = Minio(
"play.min.io",
access_key="Q3AM3UQ867SPQQA43P2F",
secret_key="zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG",
endpoint=endpoint,
access_key=access_key,
secret_key=secret_key,
)
client.remove_object("cloudstorage", f"{_id}.jpeg")
assert response.status_code == 200
Expand Down
14 changes: 8 additions & 6 deletions areas/backend/tests/test_cc/test_view_file.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import pytest
from minio import Minio

from config import *


class TestViewFileById:

Expand All @@ -24,9 +26,9 @@ def test_file_damaged(self, app_client_user):
})
_id = response.json['id']
client = Minio(
"play.min.io",
access_key="Q3AM3UQ867SPQQA43P2F",
secret_key="zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG",
endpoint=endpoint,
access_key=access_key,
secret_key=secret_key,
)
client.remove_object("cloudstorage", f"{_id}.jpeg")
response = app_client_user.get(f'/file/{_id}/view')
Expand All @@ -44,9 +46,9 @@ def test_file_success(self, app_client_user):
_id = response.json['id']
response = app_client_user.get(f'/file/{_id}/view')
client = Minio(
"play.min.io",
access_key="Q3AM3UQ867SPQQA43P2F",
secret_key="zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG",
endpoint=endpoint,
access_key=access_key,
secret_key=secret_key,
)
client.remove_object("cloudstorage", f"{_id}.jpeg")
assert response.status_code == 200

0 comments on commit a0073a6

Please sign in to comment.