Merge pull request #11 from energie360/feature/replace-id-with-pk

Replace id lookup with pk

djangocms_xliff/cms_toolbars.py

@@ -31,12 +31,12 @@ def update_language_menu(self, obj):
         if not language_menu:
             return None
 
-        content_type_id = ContentType.objects.get_for_model(obj.__class__).id
+        content_type_id = ContentType.objects.get_for_model(obj.__class__).pk
         reverse_xliff = partial(
             reverse,
             kwargs={
                 "content_type_id": content_type_id,
-                "obj_id": obj.id,
+                "obj_id": obj.pk,
                 "current_language": self.current_lang,
             },
         )

djangocms_xliff/exports.py

@@ -16,7 +16,7 @@ def convert_obj_to_xliff_context(obj: XliffObj, source_language: str, target_lan
         source_language=source_language,
         target_language=target_language,
         content_type_id=content_type_id,
-        obj_id=obj.id,
+        obj_id=obj.pk,
         path=get_path(obj=obj, language=target_language),
         units=extract_units_from_obj(obj, target_language),
     )

djangocms_xliff/imports.py

@@ -80,7 +80,7 @@ def save_xliff_context(xliff_context: XliffContext) -> None:
 
 
 def validate_page_with_xliff_context(obj: XliffObj, xliff_context: XliffContext, current_language: str):
-    obj_id = obj.id
+    obj_id = obj.pk
     xliff_obj_id = xliff_context.obj_id
     if obj_id != xliff_obj_id:
         error_message = _('Selected page id: "%(obj_id)s" is not the same as xliff page id: "%(xliff_obj_id)s"')

djangocms_xliff/management/commands/xliff_page_plugins.py

@@ -31,7 +31,7 @@ def handle(self, *args, **options):
 
             self.stdout.write(
                 self.style.SUCCESS(
-                    f"Found {len(units)} xliff units on page with id: {obj.id} and language: {current_language}"
+                    f"Found {len(units)} xliff units on page with id: {obj.pk} and language: {current_language}"
                 )
             )
             self.stdout.write()

djangocms_xliff/parsers.py

@@ -66,7 +66,7 @@ def parse_tool_element(self) -> Tuple[int, int]:
             # For backwards compatibility, if there are existing xliff files
             # with just the page_id as the tool-id
             obj_id = tool_element.attrib["tool-id"]
-            content_type_id = ContentType.objects.get_for_model(Page).id
+            content_type_id = ContentType.objects.get_for_model(Page).pk
 
         return int(content_type_id), int(obj_id)
 

djangocms_xliff/utils.py

@@ -116,10 +116,10 @@ def get_metadata_fields_for_model(obj: XliffObj) -> Dict[str, str]:
 
 
 def get_plugin_id_for_extension_obj(obj) -> str:
-    content_type_id = ContentType.objects.get_for_model(obj).id
-    return UNIT_ID_DELIMITER.join([UNIT_ID_EXTENSION_DATA_ID, str(content_type_id), str(obj.id)])
+    content_type_id = ContentType.objects.get_for_model(obj).pk
+    return UNIT_ID_DELIMITER.join([UNIT_ID_EXTENSION_DATA_ID, str(content_type_id), str(obj.pk)])
 
 
 def get_plugin_id_for_metadata_obj(obj) -> str:
-    content_type_id = ContentType.objects.get_for_model(obj).id
-    return UNIT_ID_DELIMITER.join([UNIT_ID_METADATA_ID, str(content_type_id), str(obj.id)])
+    content_type_id = ContentType.objects.get_for_model(obj).pk
+    return UNIT_ID_DELIMITER.join([UNIT_ID_METADATA_ID, str(content_type_id), str(obj.pk)])

tests/conftest.py

@@ -21,7 +21,7 @@ def _create_xliff_page_context(units, source_language="de", target_language="fr"
         return XliffContext(
             source_language=source_language,
             target_language=target_language,
-            content_type_id=ContentType.objects.get_for_model(Page).id,
+            content_type_id=ContentType.objects.get_for_model(Page).pk,
             obj_id=obj_id,
             path=path,
             units=units,

tests/test_parsers.py

@@ -8,7 +8,7 @@
 
 
 def test_parse_xliff_version_1_2_simple(create_xliff_page_context):
-    content_type_id = ContentType.objects.get_for_model(Page).id
+    content_type_id = ContentType.objects.get_for_model(Page).pk
     file_content = f"""<?xml version="1.0" encoding="utf-8" standalone="no"?>
         <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
             <file original="test" datatype="plaintext" source-language="en" target-language="de">
@@ -51,7 +51,7 @@ def test_parse_xliff_version_1_2_simple(create_xliff_page_context):
 
 
 def test_parse_xliff_version_1_2_utf_8_characters(create_xliff_page_context):
-    content_type_id = ContentType.objects.get_for_model(Page).id
+    content_type_id = ContentType.objects.get_for_model(Page).pk
     file_content = f"""<?xml version="1.0" encoding="utf-8" standalone="no"?>
         <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
             <file original="test/example" datatype="plaintext" source-language="de" target-language="fr">
@@ -112,7 +112,7 @@ def test_parse_xliff_version_1_2_utf_8_characters(create_xliff_page_context):
 
 
 def test_parse_xliff_version_1_2_html(create_xliff_page_context):
-    content_type_id = ContentType.objects.get_for_model(Page).id
+    content_type_id = ContentType.objects.get_for_model(Page).pk
     file_content = f"""<?xml version="1.0" encoding="utf-8" standalone="no"?>
         <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
             <file original="test/example" datatype="plaintext" source-language="de" target-language="fr">

tests/test_renderer.py

@@ -23,7 +23,7 @@ def test_create_xliff_version_1_2_simple(create_xliff_page_context):
 
     xliff_context = create_xliff_page_context(units)
 
-    content_type_id = ContentType.objects.get_for_model(Page).id
+    content_type_id = ContentType.objects.get_for_model(Page).pk
 
     expected = f"""<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">