Handle filtering by FRID

Author: Tjaz Erzen

git_utils.py

@@ -264,12 +264,49 @@ def _get_commit(repo: Repo, frid: Optional[str]) -> str:
     return initial_commit
 
 
-def _get_commit_with_frid(repo: Repo, frid: str) -> str:
-    """Finds commit with given frid mentioned in the commit message."""
-    return _get_commit_with_message(repo, FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE.format(frid))
+def _get_commit_with_frid(
+    repo: Repo, frid: str, module_name: Optional[str] = None
+) -> str:
+    """
+    Finds commit with given frid mentioned in the commit message.
+
+    Args:
+        repo (Repo): Git repository object
+        frid (str): Functional requirement ID
+        module_name (Optional[str]): Module name to filter by. If provided, only returns
+                                      commits that have both the FRID and module name.
+
+    Returns:
+        str: Commit SHA if found, empty string otherwise
+    """
+    commit_message_pattern = FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE.format(frid)
+
+    # If no module name filtering is needed, use the original logic
+    if not module_name:
+        return _get_commit_with_message(repo, commit_message_pattern)
+
+    # Use multiple grep patterns with --all-match for AND condition
+    escaped_frid_message = commit_message_pattern.replace("[", "\\[").replace(
+        "]", "\\]"
+    )
+    module_name_pattern = MODULE_NAME_MESSAGE.format(module_name)
+    escaped_module_message = module_name_pattern.replace("[", "\\[").replace("]", "\\]")
+
+    return repo.git.rev_list(
+        repo.active_branch.name,
+        "--grep",
+        escaped_frid_message,
+        "--grep",
+        escaped_module_message,
+        "--all-match",
+        "-n",
+        "1",
+    )
 
 
-def has_commit_for_frid(repo_path: Union[str, os.PathLike], frid: str) -> bool:
+def has_commit_for_frid(
+    repo_path: Union[str, os.PathLike], frid: str, module_name: Optional[str] = None
+) -> bool:
     """
     Check if a commit exists for the given FRID in the repository.
 
@@ -281,7 +318,7 @@ def has_commit_for_frid(repo_path: Union[str, os.PathLike], frid: str) -> bool:
         bool: True if the commit exists, False otherwise
     """
     repo = Repo(repo_path)
-    commit_with_frid = _get_commit_with_frid(repo, frid)
+    commit_with_frid = _get_commit_with_frid(repo, frid, module_name)
     if not commit_with_frid:
         return False
     return True

module_renderer.py

@@ -73,11 +73,29 @@ def _validate_previous_frid_commits_exist(
 
         # Check if commits exist for all previous FRIDs
         build_folder_path = os.path.join(self.args.build_folder, module_name)
-        conformance_tests_path = os.path.join(self.args.conformance_tests_folder, module_name)
+        conformance_tests_path = os.path.join(
+            self.args.conformance_tests_folder, module_name
+        )
+
+        if not os.path.exists(build_folder_path):
+            raise MissingPreviousFridCommitsError(
+                f"Cannot render from FRID {first_render_frid}: "
+                f"Folder {build_folder_path} for module {module_name} does not exist. "
+                f"Please render all previous FRIDs for module {module_name} first."
+            )
+
+        if not os.path.exists(conformance_tests_path):
+            raise MissingPreviousFridCommitsError(
+                f"Cannot render from FRID {first_render_frid}: "
+                f"Folder {conformance_tests_path} for module {module_name} does not exist. "
+                f"Please render all previous FRIDs for module {module_name} first."
+            )
 
         for prev_frid in previous_frids:
             # Check in build folder
-            if not git_utils.has_commit_for_frid(build_folder_path, prev_frid):
+            if not git_utils.has_commit_for_frid(
+                build_folder_path, prev_frid, module_name
+            ):
                 raise MissingPreviousFridCommitsError(
                     f"Cannot render from FRID {first_render_frid}: "
                     f"Missing commit for previous FRID {prev_frid} in {build_folder_path}. "
@@ -86,7 +104,9 @@ def _validate_previous_frid_commits_exist(
 
             # Check in conformance tests folder (only if conformance tests are enabled)
             if self.args.render_conformance_tests:
-                if not git_utils.has_commit_for_frid(conformance_tests_path, prev_frid):
+                if not git_utils.has_commit_for_frid(
+                    conformance_tests_path, prev_frid, module_name
+                ):
                     raise MissingPreviousFridCommitsError(
                         f"Cannot render from FRID {first_render_frid}: "
                         f"Missing commit for previous FRID {prev_frid} in {conformance_tests_path}. "

plain2code.py

@@ -13,7 +13,7 @@
 import plain_file
 import plain_spec
 from event_bus import EventBus
-from module_renderer import ModuleRenderer
+from module_renderer import MissingPreviousFridCommitsError, ModuleRenderer
 from plain2code_arguments import parse_arguments
 from plain2code_console import console
 from plain2code_exceptions import PlainSyntaxError
@@ -272,6 +272,10 @@ def main():  # noqa: C901
         console.error(f"Error rendering plain code: {str(e)}\n")
         console.debug(f"Render ID: {run_state.render_id}")
         dump_crash_logs(args)
+    except MissingPreviousFridCommitsError as e:
+        console.error(f"Error rendering plain code: {str(e)}\n")
+        console.debug(f"Render ID: {run_state.render_id}")
+        dump_crash_logs(args)
     except Exception as e:
         console.error(f"Error rendering plain code: {str(e)}\n")
         console.debug(f"Render ID: {run_state.render_id}")