sonar fixes

Author: ReenigneArcher

src/update_db.py

@@ -200,6 +200,82 @@ def _fetch_all_endpoints(request_dict: dict, limit: int, test_mode: bool, test_l
     return full_dict
 
 
+def _build_related_entry(value: dict, fields: list) -> dict:
+    """
+    Build a new entry dict from value containing only the specified fields.
+
+    Parameters
+    ----------
+    value : dict
+        The source item dictionary.
+    fields : list
+        The list of field names to include.
+
+    Returns
+    -------
+    dict
+        A dictionary containing only the requested fields present in value.
+    """
+    return {field: value[field] for field in fields if field in value}
+
+
+def _append_item_to_endpoint(full_dict: dict, endpoint: str, item_type: str, value: dict, fields: list) -> None:
+    """
+    Append a single related item into all matching destination entries in the endpoint.
+
+    Parameters
+    ----------
+    full_dict : dict
+        The combined data dictionary (mutated in-place).
+    endpoint : str
+        The destination endpoint name.
+    item_type : str
+        The type key under which to append the entry.
+    value : dict
+        The source item containing a list of destination IDs under the endpoint key.
+    fields : list
+        Fields to copy from value into the new entry.
+    """
+    append_to = value.get(endpoint)
+    if not append_to:
+        return
+
+    new_entry = _build_related_entry(value=value, fields=fields)
+
+    for item_id_dest in append_to:
+        if item_id_dest not in full_dict[endpoint]:
+            continue
+        if item_type not in full_dict[endpoint][item_id_dest]:
+            full_dict[endpoint][item_id_dest][item_type] = []
+        full_dict[endpoint][item_id_dest][item_type].append(new_entry)
+
+
+def _append_item_type(full_dict: dict, endpoint: str, item_type: str, fields: list) -> None:
+    """
+    Append all items of a given type into the appropriate endpoint entries.
+
+    Parameters
+    ----------
+    full_dict : dict
+        The combined data dictionary (mutated in-place).
+    endpoint : str
+        The destination endpoint name.
+    item_type : str
+        The source item type to iterate over.
+    fields : list
+        Fields to include in each appended entry.
+    """
+    print(f'adding {item_type} to {endpoint}')
+    for value in full_dict[item_type].values():
+        _append_item_to_endpoint(
+            full_dict=full_dict,
+            endpoint=endpoint,
+            item_type=item_type,
+            value=value,
+            fields=fields,
+        )
+
+
 def _append_related_items(full_dict: dict, request_dict: dict) -> None:
     """
     Append related items (e.g. characters to games, games to platforms) into full_dict in-place.
@@ -212,32 +288,17 @@ def _append_related_items(full_dict: dict, request_dict: dict) -> None:
         Endpoint configuration containing 'append' sub-dicts.
     """
     for endpoint, endpoint_dict in request_dict.items():
-        try:
-            append_dict = endpoint_dict['append']
-        except KeyError:
+        append_dict = endpoint_dict.get('append')
+        if not append_dict:
             continue
 
         for item_type, item_type_dict in append_dict.items():
-            print(f'adding {item_type} to {endpoint}')
-            for item_id_src, value in full_dict[item_type].items():
-                try:
-                    append_to = value[endpoint]
-                except KeyError:
-                    continue
-
-                for item_id_dest in append_to:
-                    if item_id_dest not in full_dict[endpoint]:
-                        continue
-
-                    if item_type not in full_dict[endpoint][item_id_dest]:
-                        full_dict[endpoint][item_id_dest][item_type] = []
-
-                    new_entry = {}
-                    for field in item_type_dict['fields']:
-                        if field in value:
-                            new_entry[field] = value[field]
-
-                    full_dict[endpoint][item_id_dest][item_type].append(new_entry)
+            _append_item_type(
+                full_dict=full_dict,
+                endpoint=endpoint,
+                item_type=item_type,
+                fields=item_type_dict['fields'],
+            )
 
 
 def _add_platform_game_counts(full_dict: dict) -> None:

tests/game_detail.test.js

@@ -478,7 +478,7 @@ describe('game_detail.js', () => {
             });
             const bigImgs = document.getElementById('header-big-imgs');
             expect(bigImgs.dataset.numImg).toBe('2');
-            expect(bigImgs.getAttribute('data-img-src-1')).toContain('art1');
+            expect(bigImgs.dataset.imgSrc1).toContain('art1');
         });
 
         test('hides page heading when no artworks and heading exists', () => {
@@ -489,7 +489,7 @@ describe('game_detail.js', () => {
 
         test('does nothing when no artworks and no .page-heading in DOM', () => {
             const pageHeading = document.querySelector('.page-heading');
-            pageHeading.parentNode.removeChild(pageHeading);
+            pageHeading.remove();
             // Should not throw and should not affect any element
             expect(() => setupGameBanner({})).not.toThrow();
         });
@@ -506,7 +506,7 @@ describe('game_detail.js', () => {
         test('does not throw when artworks present but no intro-header.big-img', () => {
             // Remove intro-header from DOM entirely
             const introHeader = document.querySelector('.intro-header');
-            introHeader.parentNode.removeChild(introHeader);
+            introHeader.remove();
             expect(() => setupGameBanner({
                 artworks: [{ url: '//images.igdb.com/t_thumb/art.jpg' }],
             })).not.toThrow();
@@ -515,7 +515,7 @@ describe('game_detail.js', () => {
         test('skips pageHeading visibility when pageHeading absent (no .page-heading)', () => {
             // Remove page-heading from DOM
             const pageHeading = document.querySelector('.page-heading');
-            pageHeading.parentNode.removeChild(pageHeading);
+            pageHeading.remove();
             document.querySelector('.intro-header').classList.add('big-img');
             expect(() => setupGameBanner({
                 artworks: [{ url: '//images.igdb.com/t_thumb/art.jpg' }],
@@ -535,7 +535,7 @@ describe('game_detail.js', () => {
         test('does not throw when artworks present but no .page-heading anywhere', () => {
             // Remove header.header-section entirely
             const header = document.querySelector('header.header-section');
-            header.parentNode.removeChild(header);
+            header.remove();
             expect(() => setupGameBanner({ artworks: [{ url: '//img.igdb.com/t.jpg' }] })).not.toThrow();
         });
     });
@@ -549,10 +549,10 @@ describe('game_detail.js', () => {
         test('sets initial image and cycles when multiple artworks', () => {
             const bigImgs = document.getElementById('header-big-imgs');
             bigImgs.dataset.numImg = '2';
-            bigImgs.setAttribute('data-img-src-1', 'https://example.com/art1.jpg');
-            bigImgs.setAttribute('data-img-src-2', 'https://example.com/art2.jpg');
-            bigImgs.setAttribute('data-img-desc-1', 'null');
-            bigImgs.setAttribute('data-img-desc-2', 'Artwork 2');
+            bigImgs.dataset.imgSrc1 = 'https://example.com/art1.jpg';
+            bigImgs.dataset.imgSrc2 = 'https://example.com/art2.jpg';
+            bigImgs.dataset.imgDesc1 = 'null';
+            bigImgs.dataset.imgDesc2 = 'Artwork 2';
 
             const introHeader = document.querySelector('.intro-header');
             introHeader.classList.add('big-img');
@@ -574,16 +574,16 @@ describe('game_detail.js', () => {
         test('returns early when no intro-header.big-img found', () => {
             const bigImgs = document.getElementById('header-big-imgs');
             bigImgs.dataset.numImg = '1';
-            bigImgs.setAttribute('data-img-src-1', 'https://example.com/art.jpg');
+            bigImgs.dataset.imgSrc1 = 'https://example.com/art.jpg';
             // intro-header does NOT have big-img class — should return early
             expect(() => initGameBanner()).not.toThrow();
         });
 
         test('sets background image without crashing when no .img-desc inside intro-header', () => {
             const bigImgs = document.getElementById('header-big-imgs');
             bigImgs.dataset.numImg = '1';
-            bigImgs.setAttribute('data-img-src-1', 'https://example.com/art.jpg');
-            bigImgs.setAttribute('data-img-desc-1', 'Some description');
+            bigImgs.dataset.imgSrc1 = 'https://example.com/art.jpg';
+            bigImgs.dataset.imgDesc1 = 'Some description';
             const introHeader = document.querySelector('.intro-header');
             introHeader.classList.add('big-img');
             // Do NOT add .img-desc — covers the if(imgDesc) false branch
@@ -633,7 +633,7 @@ describe('game_detail.js', () => {
         test('renders game without header h1 (pageHeaderH1 is null)', () => {
             // Remove .page-heading h1 from DOM
             const h1 = document.querySelector('header.header-section .page-heading h1');
-            if (h1) h1.parentNode.removeChild(h1);
+            if (h1) h1.remove();
             expect(() => renderGame({ name: 'No Header Game' })).not.toThrow();
             expect(document.getElementById('game-name').textContent).toBe('No Header Game');
         });

tests/item_loader.test.js

@@ -28,11 +28,11 @@ globalThis.$ = function() {
 };
 globalThis.$.ajaxSetup = () => {};
 globalThis.$.ajax = function(opts) {
-    if (opts && opts.success) {
+    if (opts?.success) {
         // Return mock data appropriate to the URL
-        if (opts.url && opts.url.includes('cross-reference')) {
+        if (opts?.url?.includes('cross-reference')) {
             opts.success({});
-        } else if (opts.url && opts.url.includes('all.json')) {
+        } else if (opts?.url?.includes('all.json')) {
             opts.success({
                 '1': {
                     id: 1, name: 'PC', url: 'https://igdb.com', summary: 'Personal computer.',

tests/platform_detail.test.js

@@ -138,7 +138,7 @@ describe('platform_detail.js', () => {
 
     describe('renderPlatformMetadata', () => {
         test('renders game count (plural)', () => {
-            renderPlatformMetadata({ games: Array(42).fill({}) });
+            renderPlatformMetadata({ games: new Array(42).fill({}) });
             expect(document.getElementById('platform-meta').textContent).toContain('42 games');
         });