feat: add resolved file name handling for versioned files to properly format CDN key

Enhanced `VersionedFile` to support distinct properties for `full_name` and `resolved_full_name`, enabling separate handling of base file names and versioned file names. Updated related tests and action classes to reflect these changes.

Author: danoctua

backend/core/actions/jetton.py

@@ -155,17 +155,19 @@ async def _get_blockchain_info(self, address_raw: str, version: int) -> JettonDT
                     jetton_logo,
                     target_location=tmp_file,
                 )
-                # Make sure the cursor is set at the beginning to avoid empty files
-                tmp_file.seek(0)
-                logo_path = VersionedFile(
-                    base_name=address_raw,
-                    version=version,
-                    extension=file_extension,
-                ).full_name
+
                 if file_extension:
+                    # Make sure the cursor is set at the beginning to avoid empty files
+                    tmp_file.seek(0)
+                    versioned_file = VersionedFile(
+                        base_name=address_raw,
+                        version=version,
+                        extension=file_extension,
+                    )
+                    logo_path = versioned_file.resolved_full_name
                     await self.cdn_service.upload_file(
                         file_path=tmp_file.name,
-                        object_name=logo_path,
+                        object_name=versioned_file.full_name,
                     )
 
         dto = JettonDTO.from_info(jetton_info, logo_path)

backend/core/actions/nft_collection.py

@@ -161,13 +161,14 @@ async def _get_blockchain_info(
                 # Make sure the cursor is set at the beginning to avoid empty files
                 tmp_file.seek(0)
                 if file_extension:
-                    logo_path = VersionedFile(
+                    versioned_file = VersionedFile(
                         base_name=address_raw,
                         version=version,
                         extension=file_extension,
-                    ).full_name
+                    )
+                    logo_path = versioned_file.resolved_full_name
                     await self.cdn_service.upload_file(
-                        file_path=tmp_file.name, object_name=logo_path
+                        file_path=tmp_file.name, object_name=versioned_file.full_name
                     )
 
         dto = NftCollectionDTO.from_info(nft_collection_data, logo_path)

backend/core/utils/file.py

@@ -158,6 +158,15 @@ def from_filename(cls, file_name: str) -> Self:
         return instance
 
     def _format_file_name(self) -> str:
+        """
+        Returns the full formatted name of the file, including base name and extension only
+        """
+        return f"{self.base_name}{self._extension}"
+
+    def _resolve_file_name(self) -> str:
+        """
+        Resolves the file name based on the version.
+        """
         return f"{self.base_name}{self._extension}?v={self._version}"
 
     def _parse_file_name(self) -> tuple[str, int | None, str]:
@@ -174,8 +183,18 @@ def _parse_file_name(self) -> tuple[str, int | None, str]:
 
     @property
     def full_name(self) -> str:
+        """
+        Returns the full formatted name of the file, including base name and extension.
+        """
         return self._format_file_name()
 
+    @property
+    def resolved_full_name(self) -> str:
+        """
+        Returns the full formatted name of the file, including base name, version, and extension.
+        """
+        return self._resolve_file_name()
+
     @property
     def base_name(self) -> str:
         return self._base_name

backend/tests/unit/core/actions/test_jetton.py

@@ -299,7 +299,7 @@ async def test_refresh__increments_file_version__pass(
     jetton_dto = JettonDTO.from_orm(jetton)
     new_version = logo_path_obj.get_next_version()
     logo_path_obj._version = new_version
-    jetton_dto.logo_path = logo_path_obj.full_name
+    jetton_dto.logo_path = logo_path_obj.resolved_full_name
     jetton_action._get_blockchain_info = mocker.AsyncMock(return_value=jetton_dto)
     await jetton_action.refresh(jetton.address)
 

backend/tests/unit/core/utils/test_file.py

@@ -58,18 +58,32 @@ def test_versioned_file__increment_version__pass(
 
 
 @pytest.mark.parametrize(
-    ("base_name", "extension", "version", "expected_filename"),
+    (
+        "base_name",
+        "extension",
+        "version",
+        "expected_filename",
+        "expected_resolved_filename",
+    ),
     [
-        ("test", ".txt", None, f"test.txt?v={DEFAULT_INCREMENTED_FILE_VERSION}"),
-        ("test", ".txt", 1, "test.txt?v=1"),
-        ("test", ".png", 123, "test.png?v=123"),
+        (
+            "test",
+            ".txt",
+            None,
+            "test.txt",
+            f"test.txt?v={DEFAULT_INCREMENTED_FILE_VERSION}",
+        ),
+        ("test", ".txt", 1, "test.txt", "test.txt?v=1"),
+        ("test", ".png", 123, "test.png", "test.png?v=123"),
     ],
 )
 def test_versioned_file__to_filename__pass(
     base_name: str,
     extension: str,
     version: int | None,
     expected_filename: str,
+    expected_resolved_filename: str,
 ) -> None:
     result = VersionedFile(base_name, extension, version)
     assert result.full_name == expected_filename
+    assert result.resolved_full_name == expected_resolved_filename