Reorder license match attributes

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Author: AyanSinhaMahapatra

src/licensedcode/detection.py

@@ -670,32 +670,29 @@ def to_dict(
 
         result = {}
 
-        # Detection Level Information
-        result['score'] = self.score()
+        result['license_expression'] = self.rule.license_expression
+        result['license_expression_spdx'] = self.rule.spdx_license_expression()
         result['from_file'] = self.from_file
         result['start_line'] = self.start_line
         result['end_line'] = self.end_line
+        if rule_details:
+            result.update(self.rule.get_flags_mapping())
+        result['matcher'] = self.matcher
+        result['score'] = self.score()
         result['matched_length'] = self.len()
+        if rule_details:
+            result["rule_length"] = self.rule.length
         result['match_coverage'] = self.coverage()
-        result['matcher'] = self.matcher
-
-        # LicenseDB Level Information (Rule that was matched)
-        result['license_expression'] = self.rule.license_expression
-        result['license_expression_spdx'] = self.rule.spdx_license_expression()
-        result['rule_identifier'] = self.rule.identifier
         result['rule_relevance'] = self.rule.relevance
+        result['rule_identifier'] = self.rule.identifier
         result['rule_url'] = self.rule.rule_url
-
-        # Extra rule details added optionally
         if rule_details:
-            result.update(self.rule.get_flags_mapping())
-            result["rule_length"] = self.rule.length
-            result["rule_text"] = self.rule.text
             result["rule_notes"] = self.rule.notes
             result["referenced_filenames"] = self.rule.referenced_filenames
-
         if include_text:
             result['matched_text'] = matched_text
+        if rule_details:
+            result["rule_text"] = self.rule.text
 
         return result
 

src/licensedcode/match.py

@@ -791,20 +791,17 @@ def to_dict(
 
         result = {}
 
-        # Detection Level Information
-        result['score'] = self.score()
+        result['license_expression'] = self.rule.license_expression
+        result['spdx_license_expression'] = self.rule.spdx_license_expression()
+        result['from_file'] = file_path
         result['start_line'] = self.start_line
         result['end_line'] = self.end_line
-        result['from_file'] = file_path
+        result['matcher'] = self.matcher
+        result['score'] = self.score()
         result['matched_length'] = self.len()
         result['match_coverage'] = self.coverage()
-        result['matcher'] = self.matcher
-
-        # LicenseDB Level Information (Rule that was matched)
-        result['license_expression'] = self.rule.license_expression
-        result['spdx_license_expression'] = self.rule.spdx_license_expression()
-        result['rule_identifier'] = self.rule.identifier
         result['rule_relevance'] = self.rule.relevance
+        result['rule_identifier'] = self.rule.identifier
         result['rule_url'] = self.rule.rule_url
 
         if include_text:

src/licensedcode/models.py

@@ -1957,17 +1957,13 @@ def get_flags_mapping(self):
         """
 
         rule_boolean_attributes = [
-            'is_license_text',
             'is_license_text',
             'is_license_notice',
             'is_license_reference',
             'is_license_tag',
             'is_license_intro',
             'is_license_clue',
             'is_continuous',
-            'is_builtin',
-            'is_from_license',
-            'is_synthetic',
         ]
 
         mapping = {}