Merge pull request #5 from CodeSignal/feature/existing-users

Added user seeding

Author: matheusgalvao1

Dockerfile

@@ -7,6 +7,7 @@ COPY requirements.txt .
 # Copy configuration and initial data files
 COPY auth_config.yml .
 COPY initial_todos.json .
+COPY initial_users.json .
 
 # Install Python dependencies listed in requirements.txt
 RUN pip install --no-cache-dir -r requirements.txt

README.md

@@ -61,7 +61,9 @@ The API's authentication is configured through `auth_config.yml` in the root dir
 
 ## Initial Data
 
-The project comes with `initial_todos.json`, which contains a set of predefined todo items that serve as sample data. This file includes example todos with various states (completed and pending) to help you get started with testing the API immediately.
+The project comes with initial data, seeded at startup:
+- Todos: `initial_todos.json`
+- Users: `initial_users.json`
 
 ## Running the API
 

app/main.py

@@ -5,9 +5,9 @@
 from routes.notes import notes_bp
 from routes.auth import auth_bp, init_auth_routes
 from middleware.auth_middleware import AuthMiddleware
-from utils.config import load_config, load_initial_todos
+from utils.config import load_config, load_initial_todos, load_initial_users
 from utils.auth import setup_auth_config
-from services.auth_service import init_auth_service
+from services.auth_service import init_auth_service, add_user
 from flasgger import Swagger
 import secrets
 
@@ -75,13 +75,19 @@ def create_app(auth_config):
 
     return app
 
+def seed_users():
+    for user_data in load_initial_users():
+        if not add_user(user_data["username"], user_data["password"]):
+            print(f"Error: Failed to add user on init")
+
 if __name__ == "__main__":
     try:
         # Load authentication configuration from config file
         auth_method, secret = load_config()
 
         # Set up authentication based on configuration
         auth_config = setup_auth_config(auth_method, secret)
+        seed_users()
 
         # Initialize auth service
         init_auth_service(auth_config)

app/utils/config.py

@@ -1,6 +1,12 @@
 import yaml
 import os
 import json
+from pathlib import Path
+from typing import List
+
+INITIAL_USERS_FILE = "initial_users.json"
+INITIAL_TODOS_FILE = "initial_todos.json"
+
 
 def load_config():
     """Load configuration from auth_config.yml file."""
@@ -38,18 +44,27 @@ def load_config():
         print("Using default configuration (no auth)")
         return "none", None
 
+
 def load_initial_todos():
     """Load initial todos from the configuration file."""
-    todos_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'initial_todos.json')
-    
-    if not os.path.exists(todos_path):
-        print(f"Warning: initial_todos.json not found at {todos_path}, using empty todos list")
+    path = Path(__file__).resolve().parents[2] / INITIAL_TODOS_FILE
+    return load_initial_data(path, "todos")
+
+def load_initial_users() -> List:
+    path = Path(__file__).resolve().parents[2] / INITIAL_USERS_FILE
+    return load_initial_data(path)
+
+def load_initial_data(path: Path, data_key: str = "data") -> List:
+    filename = path.name
+
+    if not path.exists():
+        print(f"Warning: {filename} not found at {path}, using empty list")
         return []
-        
+
     try:
-        with open(todos_path, 'r') as f:
+        with open(path, 'r') as f:
             data = json.load(f)
-            return data.get('todos', [])
+            return data.get(data_key, [])
     except Exception as e:
-        print(f"Error loading initial_todos.json: {e}")
-        return [] 
+        print(f"Error loading {filename}: {e}")
+        return []

initial_users.json

@@ -0,0 +1,8 @@
+{
+  "data": [
+    {
+      "username": "johnsmith",
+      "password": "testpass123"
+    }
+  ]
+}