refactor: dodanie testow do akcji oraz refactor kodu samej akcji

fix: dodanie brakujacego clicka

Author: ivellios

.github/actions/validate-organizations/.gitignore

@@ -0,0 +1,77 @@
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# Virtual environments
+.venv/
+venv/
+env/
+ENV/
+env.bak/
+venv.bak/
+
+# Testing
+.pytest_cache/
+.coverage
+htmlcov/
+.tox/
+.nox/
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+
+# IDEs and editors
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+.project
+.pydevproject
+
+# OS specific
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+desktop.ini
+
+# Logs and temporary files
+*.log
+*.tmp
+*.temp
+.cache/
+
+# Local configuration
+.env
+.env.local
+.env.*.local
+
+# Lock files (keep uv.lock but ignore others)
+# uv.lock - keep this for reproducible builds
+poetry.lock
+Pipfile.lock

.github/actions/validate-organizations/action.yml

@@ -16,23 +16,20 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - name: Set up Python
-      uses: actions/setup-python@v4
+    - name: Install uv
+      uses: astral-sh/setup-uv@v3
       with:
-        python-version: '3.11'
+        version: "0.4.18"
 
-    - name: Cache pip dependencies
-      uses: actions/cache@v3
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('${{ github.action_path }}/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
+    - name: Set up Python
+      run: uv python install 3.11
+      shell: bash
 
     - name: Install dependencies
       shell: bash
       run: |
-        pip install -r ${{ github.action_path }}/requirements.txt
+        cd ${{ github.action_path }}
+        uv sync --frozen
     
     - name: Validate organizations
       shell: bash
@@ -41,8 +38,16 @@ runs:
         echo "Files to check: ${{ inputs.files }}"
         echo "Organizations dir: ${{ inputs.organizations-dir }}"
         ls -la organizations/ || echo "organizations directory not found"
-        export PYTHONPATH="${{ github.action_path }}:$PYTHONPATH"
-        python ${{ github.action_path }}/validate.py \
-          --files "${{ inputs.files }}" \
-          --organizations-dir "${{ inputs.organizations-dir }}" \
+        
+        # Convert relative paths to absolute paths from current working directory
+        REPO_ROOT="$(pwd)"
+        FILES_ABSOLUTE=""
+        for file in ${{ inputs.files }}; do
+          FILES_ABSOLUTE="$FILES_ABSOLUTE $REPO_ROOT/$file"
+        done
+        
+        cd ${{ github.action_path }}
+        uv run python validate.py \
+          --files "$FILES_ABSOLUTE" \
+          --organizations-dir "$REPO_ROOT/${{ inputs.organizations-dir }}" \
           --slug-field "${{ inputs.slug-field }}"

.github/actions/validate-organizations/krs_puller.py

@@ -4,12 +4,12 @@
 """
 
 import requests
-from typing import Optional, Tuple
+from typing import Optional
 
 
 class KRSDataPuller:
     """Pulls and validates organization data from Polish KRS registry."""
-    
+
     def __init__(self, krs: str):
         self.krs = krs
         self.data = self._pull_data()
@@ -19,9 +19,9 @@ def _pull_data(self) -> Optional[dict]:
         try:
             response = requests.get(
                 f"https://api-krs.ms.gov.pl/api/krs/OdpisAktualny/{self.krs}?rejestr=S&format=json",
-                timeout=10
+                timeout=10,
             )
-            
+
             if response.status_code == 200:
                 try:
                     return response.json()
@@ -35,7 +35,7 @@ def _pull_data(self) -> Optional[dict]:
                     raise
             else:
                 raise requests.HTTPError(f"Failed to fetch data for KRS {self.krs}")
-                
+
         except requests.exceptions.RequestException as e:
             raise requests.HTTPError(f"Network error fetching KRS {self.krs}: {e}")
 
@@ -44,7 +44,7 @@ def name(self) -> Optional[str]:
         """Get organization name from KRS data."""
         if not self.data:
             return None
-            
+
         return (
             self.data.get("odpis", {})
             .get("dane", {})
@@ -54,10 +54,10 @@ def name(self) -> Optional[str]:
         )
 
     @classmethod
-    def get_organization_data(cls, krs: str) -> Optional['KRSDataPuller']:
+    def get_organization_data(cls, krs: str) -> Optional["KRSDataPuller"]:
         """
         Get organization data from KRS registry.
-        
+
         Returns:
             KRSDataPuller instance if successful, None if failed
         """
@@ -69,4 +69,5 @@ def get_organization_data(cls, krs: str) -> Optional['KRSDataPuller']:
 
 class KRSMaintenanceError(Exception):
     """Raised when KRS API is in maintenance mode."""
+
     pass

.github/actions/validate-organizations/pyproject.toml

@@ -0,0 +1,28 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "organization-validator"
+version = "0.1.0"
+description = "Validates organization YAML files for conflicts and schema compliance"
+requires-python = ">=3.11"
+dependencies = [
+    "PyYAML==6.0.2",
+    "click==8.1.7",
+    "requests==2.32.3",
+    "pytest==8.3.3",
+    "pytest-mock==3.14.0",
+    "responses==0.25.3",
+    "ruff>=0.12.9",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["."]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+python_files = ["test_*.py"]
+python_classes = ["Test*"]
+python_functions = ["test_*"]
+addopts = ["-v", "--tb=short"]

.github/actions/validate-organizations/repository.py

@@ -0,0 +1,93 @@
+"""
+Repository pattern for organization data access.
+Separates file I/O from validation logic for better testability.
+"""
+
+from abc import ABC, abstractmethod
+from pathlib import Path
+from typing import Dict, List, Tuple, Optional
+import yaml
+
+
+class OrganizationRepository(ABC):
+    """Abstract repository for organization data access."""
+
+    @abstractmethod
+    def load_all_organizations(
+        self, slug_field: str
+    ) -> Tuple[Dict[str, str], List[str]]:
+        """
+        Load all organizations and return slug to filename mapping with errors.
+
+        Args:
+            slug_field: YAML field name for organization slug
+
+        Returns:
+            Tuple of (slug_to_filename_mapping, errors)
+        """
+        pass
+
+    @abstractmethod
+    def load_organization_data(self, file_path: str) -> Optional[dict]:
+        """
+        Load organization data from a specific file.
+
+        Args:
+            file_path: Path to the organization file
+
+        Returns:
+            Organization data dictionary or None if failed
+        """
+        pass
+
+
+class FileSystemRepository(OrganizationRepository):
+    """File system implementation of organization repository."""
+
+    def __init__(self, organizations_dir: str):
+        self.organizations_dir = Path(organizations_dir)
+        self.reserved_slugs = {"info", "organizacje", "404"}
+
+    def load_all_organizations(
+        self, slug_field: str
+    ) -> Tuple[Dict[str, str], List[str]]:
+        """Load all organization files and return slug to filename mapping with errors."""
+        slug_to_file = {}
+        errors = []
+
+        if not self.organizations_dir.exists():
+            return slug_to_file, errors
+
+        yaml_files = list(self.organizations_dir.glob("*.yaml")) + list(
+            self.organizations_dir.glob("*.yml")
+        )
+        for yaml_file in yaml_files:
+            try:
+                with open(yaml_file, "r", encoding="utf-8") as f:
+                    data = yaml.safe_load(f)
+                    if data and slug_field in data:
+                        slug = data[slug_field]
+                        if slug in slug_to_file:
+                            errors.append(
+                                f"Duplikat {slug_field} '{slug}' znaleziony w {yaml_file.name} i {slug_to_file[slug]}"
+                            )
+                        else:
+                            slug_to_file[slug] = str(
+                                self.organizations_dir / yaml_file.name
+                            )
+            except Exception as e:
+                errors.append(f"Błąd wczytywania pliku {yaml_file.name}: {e}")
+
+        return slug_to_file, errors
+
+    def load_organization_data(self, file_path: str) -> Optional[dict]:
+        """Load organization data from a specific file."""
+        try:
+            full_path = Path(file_path)
+            if not full_path.exists():
+                return None
+
+            with open(full_path, "r", encoding="utf-8") as f:
+                return yaml.safe_load(f)
+        except Exception:
+            return None