refactor: upgrade deprecated staticfiles template tags and fix settings paths

.env

@@ -0,0 +1 @@
+SECRET_KEY=django-insecure-local-dev-key-es2-project

.github/labeler.yml

@@ -0,0 +1,6 @@
+# Configure labels based on changed files
+backend:
+  - '**.py'
+frontend:
+  - 'app/templates/**'
+  - 'index.html'

.github/workflows/ci.yml

@@ -0,0 +1,41 @@
+name: CI/CD Pipeline
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  test-and-sonar:
+    name: Test and SonarCloud Scan
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+
+      - name: Run Tests and generate Coverage
+        env:
+          SECRET_KEY: temporary-secret-key-for-testing
+        run: |
+          pytest --cov=. --cov-report=xml
+
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@e44258b109568baa0df60ed515909fc6c72cba92
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/label.yml

@@ -7,6 +7,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/labeler@v2
+    - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

@@ -101,7 +101,6 @@ celerybeat-schedule
 *.sage.py
 
 # Environments
-.env
 .venv
 env/
 venv/

README.md

@@ -22,59 +22,48 @@
 - All the content (tutorials) is owned by the respective authors/sites.
 - tutorialdb maintains its own database saving the links to tutorials and some meta info.
 
-### Installation 🔮
+### Installation & Execution 🔮
 
-1. Create virtual environment.
+1. Create a virtual environment:
 
 	**Linux/MacOS**
 	```bash
-	virtualenv -p python3 venv && cd venv && source bin/activate
+	python3 -m venv venv && source venv/bin/activate
 	```
-	**Windows**
-	(*PowerShell*)
-	```cmd
-	py -m venv venv; .\venv\Scripts\activate;
+	**Windows (PowerShell)**
+	```powershell
+	python -m venv venv
+	.\venv\Scripts\activate
 	```
+	*(Note: If you get execution policy errors on Windows, run `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope Process` first).*
 
-2. Clone the repository.
+2. Clone the repository and navigate to it.
 
-```bash
-git clone https://github.com/Bhupesh-V/tutorialdb.git
-```    
-
-3. Install dependencies.
-
-```bash
-pip install -r requirements.txt
-```
-
-4. Set-up virtual environment variables.
-	1. Create a file named `.env` in the root directory & add the following contents.
-
-	```text
-	SECRET_KEY = 'my-secret-key'
-	LOCAL_HOST = 'my-local-ip'
+3. Install dependencies:
+	```bash
+	pip install -r requirements.txt
 	```
-	2. For `SECRET_KEY` use [Django Secret Key Generator](https://www.miniwebtool.com/django-secret-key-generator/) or [Djecrety](https://djecrety.ir/).
-	3. Adding `LOCAL_HOST` is optional.
-
-5. Migrate tables.
-
-```bash
-python manage.py migrate
-```
+	*(Note: We updated the dependencies so that `psycopg2-binary` is used on Windows instead of the source version, preventing compilation issues).*
 
-6. Run Tests.
+4. Set up Environment Variables:
+	- The repository already comes with a default `.env` file containing a `SECRET_KEY` for development, so no manual configuration is required to start!
 
-```bash
-python manage.py test
-```
+5. Run Migrations:
+	```bash
+	python manage.py migrate
+	```
 
-7. Run the development server.
+6. Run Tests and Coverage:
+	To run the test suite and output the coverage report directly on the terminal, run:
+	```bash
+	pytest --cov=. --cov-report=term-missing
+	```
 
-```bash
-python manage.py runserver
-```
+7. Run the Development Server:
+	```bash
+	python manage.py runserver
+	```
+	Open your browser at `http://127.0.0.1:8000/`.
 
 ## 📝 License
 

api/tests/test_views.py

@@ -4,13 +4,41 @@
 class APITests(TransactionTestCase):
 
     def test_tutorials_page_status_code(self):
-        response = self.client.get('/tutorials/')
-        self.assertEquals(response.status_code, 200)
+        response = self.client.get('/api/tutorials/')
+        self.assertEqual(response.status_code, 200)
 
     def test_tags_page_status_code(self):
-        response = self.client.get('/tags/')
-        self.assertEquals(response.status_code, 200)
+        response = self.client.get('/api/tags/')
+        self.assertEqual(response.status_code, 200)
 
     def test_latest_page_status_code(self):
-        response = self.client.get('/latest/')
-        self.assertEquals(response.status_code, 200)
+        response = self.client.get('/api/latest/')
+        self.assertEqual(response.status_code, 200)
+
+    def test_tutorial_tag_api(self):
+        """Valida o endpoint da API REST para filtragem de tutoriais por tag específica."""
+        from app.models import Tag, Tutorial
+        tag = Tag.objects.create(name="python")
+        t = Tutorial.objects.create(
+            title="Python Tutorial",
+            link="https://python.org",
+            category=Tutorial.DOCS,
+            publish=True
+        )
+        t.tags.add(tag)
+        response = self.client.get('/api/tutorials/python/')
+        self.assertEqual(response.status_code, 200)
+
+    def test_tutorial_tag_category_api(self):
+        """Valida o endpoint da API REST para filtragem combinada de tag e categoria."""
+        from app.models import Tag, Tutorial
+        tag = Tag.objects.create(name="django")
+        t = Tutorial.objects.create(
+            title="Django Tutorial",
+            link="https://djangoproject.com",
+            category=Tutorial.DOCS,
+            publish=True
+        )
+        t.tags.add(tag)
+        response = self.client.get('/api/tutorials/django/docs/')
+        self.assertEqual(response.status_code, 200)

api/views.py

@@ -55,7 +55,7 @@ def tutorials(request):
                         category=request.data['category']
                     )
                     for tag in tags:
-                        obj, created = Tag.objects.get_or_create(name=tag)
+                        _, created = Tag.objects.get_or_create(name=tag)
 
                     tag_obj_list = Tag.objects.filter(name__in=tags)
                     tutorial_object.tags.set(tag_obj_list)

app/models.py

@@ -11,6 +11,10 @@ class Tag(models.Model):
     def __str__(self):
         return self.name
 
+    def published_tutorials_count(self):
+        """Returns the number of published tutorials associated with this tag"""
+        return self.tutorial_set.filter(publish=True).count()
+
 
 class Tutorial(models.Model):
     """tutorials have a title, a URL, a set of tags, a category and creation date"""
@@ -20,6 +24,7 @@ class Tutorial(models.Model):
     COURSE = 'course'
     DOCS = 'docs'
     VIDEO = 'video'
+    PODCAST = 'podcast'
 
     CATEGORIES = (
         (ARTICLE, 'Article'),
@@ -28,6 +33,7 @@ class Tutorial(models.Model):
         (COURSE, 'Course'),
         (DOCS, 'Documentation'),
         (VIDEO, 'Video'),
+        (PODCAST, 'Podcast'),
     )
 
     title = models.CharField(max_length=200)
@@ -39,3 +45,7 @@ class Tutorial(models.Model):
 
     def __str__(self):
         return self.title
+
+    def is_published(self):
+        """Returns True if the tutorial is published"""
+        return self.publish

app/static/app/js/custom.js

@@ -17,9 +17,7 @@ function share(title, link) {
 }
 
 function checkEmpty() {
-	var input = document.getElementById("search-bar");
-	if (input.value === "" || input.value === null) {
-		return false;
-	}
-	return true;
+    var input = document.getElementById("search-bar");
+
+    return input.value !== "" && input.value !== null;
 }

app/templates/about.html

@@ -1,5 +1,5 @@
 {% extends 'base.html'%}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 <section class="hero is-medium is-primary is-bold">
   <div class="hero-body">

app/templates/base.html

@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <!DOCTYPE html>
 <html>
   <head>

app/templates/contribute.html

@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 <section class="hero is-medium is-primary is-bold">
   <div class="hero-body">

app/templates/home.html

@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 <section class="hero is-medium is-dark is-bold">
   <div class="hero-body" style="background-color: #04243B">

app/templates/latest.html

@@ -1,5 +1,5 @@
 {% extends 'base.html'%}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 {% if tutorials %}
 <div class="section">

app/templates/search_results.html

@@ -1,5 +1,5 @@
 {% extends 'home.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block results %}
 <div id="focus-here">
 {% if tutorials %}

app/templates/taglinks.html

@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% block content %}
-{% load staticfiles %}
+{% load static %}
 {% if tutorials %}
 <div class="section">
   <h2 class="title is-4">Tutorials Tagged 

app/templates/tags.html

@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 <div class="section">
   <div class="container">

app/templates/thankyou.html

@@ -1,5 +1,5 @@
 {% extends 'base.html'%}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 <center>
   <section class="hero is-medium is-primary is-bold">

app/tests/test_models.py

@@ -0,0 +1,59 @@
+from django.test import TestCase
+from app.models import Tag, Tutorial
+
+class TagModelTest(TestCase):
+    def test_string_representation(self):
+        """Valida que a representação em string da Tag é o seu próprio nome."""
+        tag = Tag(name="Python")
+        self.assertEqual(str(tag), tag.name)
+
+    def test_published_tutorials_count(self):
+        """Valida a contagem exclusiva de tutoriais publicados vinculados a uma tag (M2)."""
+        tag = Tag.objects.create(name="Django")
+
+        t1 = Tutorial.objects.create(
+            title="Django Tutorial 1",
+            link="https://example.com/1",
+            category=Tutorial.DOCS,
+            publish=True
+        )
+        t1.tags.add(tag)
+
+        t2 = Tutorial.objects.create(
+            title="Django Tutorial 2",
+            link="https://example.com/2",
+            category=Tutorial.DOCS,
+            publish=False
+        )
+        t2.tags.add(tag)
+
+        self.assertEqual(tag.published_tutorials_count(), 1)
+
+class TutorialModelTest(TestCase):
+    def setUp(self):
+        self.tutorial = Tutorial(
+            title="Learn Django",
+            link="https://docs.djangoproject.com/",
+            category=Tutorial.DOCS,
+            publish=True
+        )
+        self.tutorial.save()
+
+    def test_string_representation(self):
+        """Valida que a representação em string do Tutorial é o seu próprio título."""
+        self.assertEqual(str(self.tutorial), self.tutorial.title)
+
+    def test_is_published(self):
+        """Valida que is_published retorna True para tutoriais publicados (M1)."""
+        self.assertTrue(self.tutorial.is_published())
+
+    def test_not_published(self):
+        """Valida que is_published retorna False para tutoriais rascunho (M1)."""
+        draft = Tutorial(
+            title="Draft",
+            link="http://example.com",
+            category=Tutorial.ARTICLE,
+            publish=False
+        )
+        draft.save()
+        self.assertFalse(draft.is_published())