fix: handle all possible cases of IPA code (#1593)

Author: tensor5

_includes/home-listing-sw.html

@@ -30,7 +30,7 @@ <h2 class="h1">{{title}}</h2>
             <div class="col-md {% if withimages!=true %}px-3{%endif%}">
               {% if withimages == true %}
 
-              {% if item.publiccode.IT.riuso.codiceIPA != nil %}
+              {% if item.publiccode.organisation.uri or item.publiccode.IT.riuso.codiceIPA or item.publiccode.it.riuso.codiceIPA %}
                 {% assign category = "software_reuse" %}
                 {% assign icon = "it-software" %}
                 {% assign fallback = "/assets/images/cover_softwareriuso.png" %}

_includes/software-listing.html

@@ -9,7 +9,7 @@
   {% assign sw_name = description.localisedName | default: software.publiccode.name %}
 
   {% assign sw_url = '/' | append: active_lang | append: '/software/' | append: software.slug | downcase %}
-  {% if software.publiccode.IT.riuso.codiceIPA != nil %}
+  {% if software.publiccode.organisation.uri or software.publiccode.IT.riuso.codiceIPA or software.publiccode.it.riuso.codiceIPA %}
     {% assign category = "software_reuse" %}
     {% assign icon = "it-software" %}
     {% assign fallback = "/assets/images/cover_softwareriuso.png" %}

_layouts/brand-pa.html

@@ -13,7 +13,7 @@
 {% include linklist.html items=subnav dynamic=true %}
 {% endcomment %}
 
-{% assign generic_sw = site.data.crawler.software | where_exp: "item", "item.publiccode.IT.riuso.codiceIPA == page.ipa" | nested_sort_natural: "publiccode.name" | slice: 0, 60 %}
+{% assign generic_sw = site.data.crawler.software | where_exp: "item", "item.publiccode.IT.riuso.codiceIPA == page.ipa or item.publiccode.it.riuso.codiceIPA == page.ipa" | nested_sort_natural: "publiccode.name" | slice: 0, 60 %}
 
 {% assign root = '/' | append: active_lang  %}
 

_layouts/software-details.html

@@ -83,12 +83,12 @@ <h3 class="color-content font-serif my-2 my-md-4">
             {% if page.publiccode.legal.repoOwner %}
             <div class="col-sm">
               <p><span class="label">Gestito da</span>
-                {% if page.publiccode.IT.riuso.codiceIPA %}
+                {% if page.publiccode.organisation.uri or page.publiccode.IT.riuso.codiceIPA or page.publiccode.it.riuso.codiceIPA %}
                 <a href="/{{ active_lang }}/pa/{{ page.publiccode.IT.riuso.codiceIPA | downcase }}">
-                {{ page.publiccode.legal.repoOwner }}
+                {{ page.publiccode.organisation.name or page.publiccode.legal.repoOwner }}
                 </a>
                 {% else %}
-                {{ page.publiccode.legal.repoOwner }}
+                {{ page.publiccode.organisation.name or page.publiccode.legal.repoOwner }}
                 {% endif %}
               </p>
             </div>
@@ -548,7 +548,7 @@ <h2>
               <div class="col-6 col-md">
                 <p>
                   <span class="label">{{ t.software.enabling_platforms }}</span>
-                  {% assign p = page.publiccode.IT.piattaforme %}
+                  {% assign p = page.publiccode.it?.piattaforme or page.publiccode.IT.piattaforme %}
                   {% assign all_false = true %}
                   {% for key in p %}
                   {% if key.last == true %}
@@ -590,7 +590,7 @@ <h2>
               <div class="col-6 col-md">
                 <p>
                   <span class="label">{{ t.software.compliance }}</span>
-                  {% assign p = page.publiccode.IT.conforme %}
+                  {% assign p = page.publiccode.it?.piattaforme or page.publiccode.IT.conforme %}
                   {% assign all_false = true %}
                   {% for key in p %}
                   {% if key.last == true %}
@@ -754,7 +754,7 @@ <h2> {{ t.software.interest_related_softwares }} </h2>
         {% assign relsw_name = relsw_description.localisedName | default: relsw.publiccode.name %}
         {% assign relsw_url = '/' | append: active_lang | append: '/software/' | append: relsw.slug | downcase %}
 
-        {% if relsw.publiccode.IT.riuso.codiceIPA != nil %}
+        {% if relsw.publiccode.organisation.uri or relsw.publiccode.IT.riuso.codiceIPA or relsw.publiccode.it.riuso.codiceIPA %}
         {% assign category = "software_reuse" %}
         {% assign icon = "it-software" %}
         {% assign fallback = "/assets/images/cover_softwareriuso.png" %}

_layouts/software.html

@@ -12,7 +12,7 @@
 {% endcomment %}
 
 {% assign recent_sw = site.data.crawler.software | sort: "publiccode.releaseDate" | reverse | slice: 0, 4 %}
-{% assign efficient_pas = site.data.crawler.software | where_exp: "item", "item.publiccode.IT.riuso.codiceIPA != nil" | group_by: "publiccode.IT.riuso.codiceIPA" | sort: "size" | reverse | slice: 0, 3 %}
+{% assign efficient_pas = site.data.crawler.software | where_exp: "item", "item.publiccode.organisation.uri or item.publiccode.IT.riuso.codiceIPA or item.publiccode.it.riuso.codiceIPA" | group_by: "publiccode.IT.riuso.codiceIPA" | sort: "size" | reverse | slice: 0, 3 %}
 
 <div class="container">
   <div class="intro mt-5">

assets/js/api/elasticSearch.js

@@ -10,6 +10,7 @@ const client = new elasticsearch.Client({
 
 export const querySoftware = async ({ type, searchValue, filters, sortBy, from, size }) => {
   const must = [{ term: { type: 'software' } }];
+  const should = []
   if (searchValue) {
     must.push({
       multi_match: {
@@ -26,23 +27,33 @@ export const querySoftware = async ({ type, searchValue, filters, sortBy, from,
   }
 
   if (type === SOFTWARE_REUSE) {
-    must.push({ exists: { field: 'publiccode.IT.riuso.codiceIPA' } });
+    should.push(
+      { exists: { field: 'publiccode.organisation.uri' } },
+      { exists: { field: 'publiccode.IT.riuso.codiceIPA' } },
+      { exists: { field: 'publiccode.it.riuso.codiceIPA' } },
+    );
   }
 
   const must_not = [];
 
   if (type === SOFTWARE_OPEN) {
     must_not.push(
+      { exists: { field: 'publiccode.organisation.uri' } },
       { exists: { field: 'publiccode.IT.riuso.codiceIPA' } },
+      { exists: { field: 'publiccode.it.riuso.codiceIPA' } },
       { match: { 'publiccode.indendedAudience.unsupportedCountries': 'IT' } }
     );
   }
 
   const query = {
     bool: {
       filter: buildFilter(filters),
-      must,
+      must: [
+        { bool: { should } },
+        ...must 
+      ],
       must_not,
+      should
     },
   };
   return await executeQuery({ query, sort: buildSort(sortBy), from, size });

assets/js/services/searchEngine.js

@@ -132,7 +132,9 @@ const softwareItem = (source) => {
   }
 
   // Handle safely accessing nested properties that might not exist
-  const ipaCode = source.publiccode?.it?.riuso?.codiceIPA;
+  const ipaCode = source.publiccode?.organisation?.uri
+    || source.publiccode?.IT?.riuso?.codiceIPA
+    || source.publiccode?.it?.riuso?.codiceIPA;
   const category = getSoftwareCategory(ipaCode);
   const icon = category === SOFTWARE_REUSE ? 'it-software' : 'it-open-source';