Commit bb23bc56 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

exist->exists, gitlab.yml

parent 18a45325

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ lint: 
    - >

      docker run --rm remote-data-broker bash -c 

      "set -e;

      poetry run isort --filter-files --check-only . ;

      poetry run isort --filter-files --check-only --profile black . ;

      poetry run black --check --diff .;

      poetry run flake8 .;

      poetry run pylint app tests;

app/brokers/filesys/broker.py

+2 −2
Original line number Diff line number Diff line
@@ -73,6 +73,6 @@ class FilesysBroker(RemoteDataBroker): 
        fname = settings.rdb_storage_path + "/" + uid_or_key(data)

        try:

            size = Path(fname).stat().st_size

            return ObjectMetaResponse(exist=True, size=size)

            return ObjectMetaResponse(exists=True, size=size)

        except FileNotFoundError:

            return ObjectMetaResponse(exist=False, size=0)
 
            return ObjectMetaResponse(exists=False, size=0)

app/common.py

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ from pydantic import BaseModel, validator 
class ObjectMetaResponse(BaseModel):

    """This is a model for object meta response"""



    exist: bool

    exists: bool

    size: int

app/server/routers/meta.py

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ async def get_object_meta(data: ObjectData, request: Request) -> ObjectMetaRespo 
            status_code=500, detail="Something went wrong, please try later"

        ) from e

    logging.debug(

        f"\tobject meta: uid={uid_or_key(data)} exist:{resp.exist} size:{resp.size}"

        f"\tobject meta: uid={uid_or_key(data)} exists:{resp.exists} size:{resp.size}"

    )



    return resp

tests/integration/test_filesys_broker.py

+1 −1
Original line number Diff line number Diff line
@@ -85,5 +85,5 @@ class TestFilesysBroker: 


        meta = self.broker.meta(ObjectData(uid=self.UID, token="none"))



        assert meta.exist is True

        assert meta.exists is True

        assert meta.size == 5