Fix permissions and prepare admin login for deploy

- Admin-only: list contacts, create/edit campaigns and compositions
- Public: submit contact, mine contacts by email/phone, read campaigns/compositions
- Add admin_response field on ContactUs
- Update Postman base_url to https://zoneco.org/api with token save

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Shayan Azadi
2026-07-22 22:52:44 +03:30
parent 97127d5772
commit 149fb614b0
8 changed files with 425 additions and 220 deletions

View File

@@ -91,10 +91,12 @@ On Docker deploy, `entrypoint.sh` creates/updates the admin from `ADMIN_USERNAME
### Login
```
POST {{base_url}}/api/admin/login/
POST {{base_url}}/admin/login/
Content-Type: application/json
```
> In Postman, set `base_url` to `https://zoneco.org/api` (includes `/api`).
```json
{
"username": "{{admin_username}}",
@@ -102,7 +104,7 @@ Content-Type: application/json
}
```
**Response:**
**Response includes the admin token:**
```json
{
"token": "<token>",
@@ -124,14 +126,14 @@ Authorization: Token <your_token_here>
### Current admin user
```
GET {{base_url}}/api/admin/me/
GET {{base_url}}/admin/me/
Authorization: Token <token>
```
### Logout (deletes the token)
```
POST {{base_url}}/api/admin/logout/
POST {{base_url}}/admin/logout/
Authorization: Token <token>
```
@@ -139,13 +141,21 @@ Authorization: Token <token>
## API Endpoints
### Authentication
### Authentication / Permissions
| Who | Allowed |
|-----|---------|
| Public (user) | Submit contact, view own contacts (`/contact-us/mine/`), view campaigns & compositions (مقالات) |
| Admin only | List all contacts, reply to contacts, create/edit/delete campaigns & compositions |
| Action | Access |
|--------|--------|
| GET (list, retrieve, custom filters) | Public — no login required |
| POST (create) | Public — no login required |
| PUT / PATCH / DELETE | Admin only — Token required |
| GET list/retrieve campaigns & compositions | Public |
| POST create campaigns & compositions | Admin — Token required |
| PUT / PATCH / DELETE | Admin — Token required |
| Contact create | Public |
| Contact list / by_category / reply | Admin — Token required |
| Contact mine (`?email_or_phone=`) | Public |
| Admin login / logout / me | See Admin Login API above |
---

View File

@@ -2,7 +2,7 @@
"info": {
"_postman_id": "zoneco-org-api-collection",
"name": "Zoneco ORG API",
"description": "مجموعه کامل APIهای بک‌اند Zoneco ORG.\n\n1) متغیرهای collection را تنظیم کنید: base_url, admin_username, admin_password\n2) Admin Auth > POST Admin Login را بزنید\n3) توکن در admin_token ذخیره می‌شود\n4) درخواست‌های ادمین با Authorization: Token {{admin_token}} ارسال می‌شوند\n\nCredentials را در متغیرها بگذارید — در کد هاردکد نکنید.",
"description": "Zoneco ORG API\n\nbase_url must be: https://zoneco.org/api\n\n1) Set admin_username and admin_password variables\n2) Run Admin Auth > POST Admin Login\n3) Token is saved to admin_token and shown in response body\n4) Admin requests send: Authorization: Token {{admin_token}}\n\nPermissions:\n- Public: create contact, mine contacts, view campaigns & compositions\n- Admin only: list all contacts, create/edit campaigns & compositions",
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
},
"item": [
@@ -22,6 +22,7 @@
" var json = pm.response.json();",
" if (json.token) {",
" pm.collectionVariables.set('admin_token', json.token);",
" console.log('admin_token saved');",
" }",
"}"
]
@@ -40,12 +41,12 @@
"mode": "raw",
"raw": "{\n \"username\": \"{{admin_username}}\",\n \"password\": \"{{admin_password}}\"\n}"
},
"url": "{{base_url}}/api/admin/login/",
"description": "Login with admin credentials. Saves token to admin_token automatically."
"url": "{{base_url}}/admin/login/",
"description": "Login. Response includes token. Also saved to collection variable admin_token."
}
},
{
"name": "GET Admin Me",
"name": "GET Admin Me (shows token works)",
"request": {
"auth": {
"type": "apikey",
@@ -69,7 +70,7 @@
},
"method": "GET",
"header": [],
"url": "{{base_url}}/api/admin/me/"
"url": "{{base_url}}/admin/me/"
}
},
{
@@ -97,7 +98,7 @@
},
"method": "POST",
"header": [],
"url": "{{base_url}}/api/admin/logout/"
"url": "{{base_url}}/admin/logout/"
}
}
]
@@ -107,11 +108,56 @@
"description": "APIهای فرم تماس با ما",
"item": [
{
"name": "GET All Contact Us",
"name": "GET My Contact Us (Public)",
"request": {
"method": "GET",
"header": [],
"url": "{{base_url}}/api/contact-us/"
"url": {
"raw": "{{base_url}}/contact-us/mine/?email_or_phone={{my_email_or_phone}}",
"host": [
"{{base_url}}"
],
"path": [
"contact-us",
"mine",
""
],
"query": [
{
"key": "email_or_phone",
"value": "{{my_email_or_phone}}",
"description": "Your email or phone used when submitting the form"
}
]
}
}
},
{
"name": "GET All Contact Us (Admin)",
"request": {
"method": "GET",
"header": [],
"url": "{{base_url}}/contact-us/",
"auth": {
"type": "apikey",
"apikey": [
{
"key": "key",
"value": "Authorization",
"type": "string"
},
{
"key": "value",
"value": "Token {{admin_token}}",
"type": "string"
},
{
"key": "in",
"value": "header",
"type": "string"
}
]
}
}
},
{
@@ -119,7 +165,7 @@
"request": {
"method": "GET",
"header": [],
"url": "{{base_url}}/api/contact-us/1/"
"url": "{{base_url}}/contact-us/1/"
}
},
{
@@ -136,21 +182,20 @@
"mode": "raw",
"raw": "{\n \"name\": \"احمد محمدی\",\n \"email_or_phone\": \"ahmad@example.com\",\n \"description\": \"سلام، می‌خواستم در مورد خدمات شما اطلاعات بیشتری دریافت کنم.\",\n \"category\": \"پشتیبانی\"\n}"
},
"url": "{{base_url}}/api/contact-us/"
"url": "{{base_url}}/contact-us/"
}
},
{
"name": "GET Contact Us by Category",
"name": "GET Contact Us by Category (Admin)",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "{{base_url}}/api/contact-us/by_category/?category=پشتیبانی",
"raw": "{{base_url}}/contact-us/by_category/?category=پشتیبانی",
"host": [
"{{base_url}}"
],
"path": [
"api",
"contact-us",
"by_category",
""
@@ -162,6 +207,26 @@
"description": "همکاری | فروش | پشتیبانی | درخواست مشاور | سایر"
}
]
},
"auth": {
"type": "apikey",
"apikey": [
{
"key": "key",
"value": "Authorization",
"type": "string"
},
{
"key": "value",
"value": "Token {{admin_token}}",
"type": "string"
},
{
"key": "in",
"value": "header",
"type": "string"
}
]
}
}
},
@@ -197,9 +262,9 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"name\": \"نام بروزرسانی شده\"\n}"
"raw": "{\n \"admin_response\": \"پاسخ ادمین به پیام شما\"\n}"
},
"url": "{{base_url}}/api/contact-us/1/"
"url": "{{base_url}}/contact-us/1/"
}
},
{
@@ -227,7 +292,7 @@
},
"method": "DELETE",
"header": [],
"url": "{{base_url}}/api/contact-us/1/"
"url": "{{base_url}}/contact-us/1/"
}
}
]
@@ -241,7 +306,7 @@
"request": {
"method": "GET",
"header": [],
"url": "{{base_url}}/api/compositions/"
"url": "{{base_url}}/compositions/"
}
},
{
@@ -249,7 +314,7 @@
"request": {
"method": "GET",
"header": [],
"url": "{{base_url}}/api/compositions/{{composition_id}}/"
"url": "{{base_url}}/compositions/{{composition_id}}/"
}
},
{
@@ -258,12 +323,11 @@
"method": "GET",
"header": [],
"url": {
"raw": "{{base_url}}/api/compositions/by-created-at/?from=2026-01-01T00:00:00Z&to=2026-12-31T23:59:59Z",
"raw": "{{base_url}}/compositions/by-created-at/?from=2026-01-01T00:00:00Z&to=2026-12-31T23:59:59Z",
"host": [
"{{base_url}}"
],
"path": [
"api",
"compositions",
"by-created-at",
""
@@ -284,7 +348,7 @@
}
},
{
"name": "POST Create Composition (JSON)",
"name": "POST Create Composition (JSON) (Admin)",
"request": {
"method": "POST",
"header": [
@@ -297,11 +361,31 @@
"mode": "raw",
"raw": "{\n \"name\": \"ترکیب تست\",\n \"description\": \"این یک ترکیب تستی است\"\n}"
},
"url": "{{base_url}}/api/compositions/"
"url": "{{base_url}}/compositions/",
"auth": {
"type": "apikey",
"apikey": [
{
"key": "key",
"value": "Authorization",
"type": "string"
},
{
"key": "value",
"value": "Token {{admin_token}}",
"type": "string"
},
{
"key": "in",
"value": "header",
"type": "string"
}
]
}
}
},
{
"name": "POST Create Composition with Images",
"name": "POST Create Composition with Images (Admin)",
"request": {
"method": "POST",
"header": [],
@@ -336,7 +420,27 @@
}
]
},
"url": "{{base_url}}/api/compositions/"
"url": "{{base_url}}/compositions/",
"auth": {
"type": "apikey",
"apikey": [
{
"key": "key",
"value": "Authorization",
"type": "string"
},
{
"key": "value",
"value": "Token {{admin_token}}",
"type": "string"
},
{
"key": "in",
"value": "header",
"type": "string"
}
]
}
}
},
{
@@ -379,7 +483,7 @@
}
]
},
"url": "{{base_url}}/api/compositions/{{composition_id}}/add-images/"
"url": "{{base_url}}/compositions/{{composition_id}}/add-images/"
}
},
{
@@ -416,7 +520,7 @@
"mode": "raw",
"raw": "{\n \"image_id\": {{image_id}}\n}"
},
"url": "{{base_url}}/api/compositions/{{composition_id}}/set-main-image/"
"url": "{{base_url}}/compositions/{{composition_id}}/set-main-image/"
}
},
{
@@ -444,7 +548,7 @@
},
"method": "DELETE",
"header": [],
"url": "{{base_url}}/api/compositions/{{composition_id}}/images/{{image_id}}/"
"url": "{{base_url}}/compositions/{{composition_id}}/images/{{image_id}}/"
}
},
{
@@ -481,7 +585,7 @@
"mode": "raw",
"raw": "{\n \"name\": \"نام بروزرسانی شده\"\n}"
},
"url": "{{base_url}}/api/compositions/{{composition_id}}/"
"url": "{{base_url}}/compositions/{{composition_id}}/"
}
},
{
@@ -509,7 +613,7 @@
},
"method": "DELETE",
"header": [],
"url": "{{base_url}}/api/compositions/{{composition_id}}/"
"url": "{{base_url}}/compositions/{{composition_id}}/"
}
}
]
@@ -523,7 +627,7 @@
"request": {
"method": "GET",
"header": [],
"url": "{{base_url}}/api/campaigns/"
"url": "{{base_url}}/campaigns/"
}
},
{
@@ -531,11 +635,11 @@
"request": {
"method": "GET",
"header": [],
"url": "{{base_url}}/api/campaigns/1/"
"url": "{{base_url}}/campaigns/1/"
}
},
{
"name": "POST Create Campaign",
"name": "POST Create Campaign (Admin)",
"request": {
"method": "POST",
"header": [
@@ -548,11 +652,31 @@
"mode": "raw",
"raw": "{\n \"name\": \"کمپین تست\",\n \"description\": \"این یک کمپین تستی است\",\n \"start_time\": \"2026-06-01T00:00:00Z\",\n \"end_time\": \"2026-12-31T23:59:59Z\"\n}"
},
"url": "{{base_url}}/api/campaigns/"
"url": "{{base_url}}/campaigns/",
"auth": {
"type": "apikey",
"apikey": [
{
"key": "key",
"value": "Authorization",
"type": "string"
},
{
"key": "value",
"value": "Token {{admin_token}}",
"type": "string"
},
{
"key": "in",
"value": "header",
"type": "string"
}
]
}
}
},
{
"name": "POST Create Campaign with Image",
"name": "POST Create Campaign with Image (Admin)",
"request": {
"method": "POST",
"header": [],
@@ -586,7 +710,27 @@
}
]
},
"url": "{{base_url}}/api/campaigns/"
"url": "{{base_url}}/campaigns/",
"auth": {
"type": "apikey",
"apikey": [
{
"key": "key",
"value": "Authorization",
"type": "string"
},
{
"key": "value",
"value": "Token {{admin_token}}",
"type": "string"
},
{
"key": "in",
"value": "header",
"type": "string"
}
]
}
}
},
{
@@ -594,7 +738,7 @@
"request": {
"method": "GET",
"header": [],
"url": "{{base_url}}/api/campaigns/active/"
"url": "{{base_url}}/campaigns/active/"
}
},
{
@@ -602,7 +746,7 @@
"request": {
"method": "GET",
"header": [],
"url": "{{base_url}}/api/campaigns/upcoming/"
"url": "{{base_url}}/campaigns/upcoming/"
}
},
{
@@ -610,7 +754,7 @@
"request": {
"method": "GET",
"header": [],
"url": "{{base_url}}/api/campaigns/ended/"
"url": "{{base_url}}/campaigns/ended/"
}
},
{
@@ -647,7 +791,7 @@
"mode": "raw",
"raw": "{\n \"name\": \"نام بروزرسانی شده\"\n}"
},
"url": "{{base_url}}/api/campaigns/1/"
"url": "{{base_url}}/campaigns/1/"
}
},
{
@@ -675,7 +819,7 @@
},
"method": "DELETE",
"header": [],
"url": "{{base_url}}/api/campaigns/1/"
"url": "{{base_url}}/campaigns/1/"
}
}
]
@@ -684,7 +828,7 @@
"variable": [
{
"key": "base_url",
"value": "http://127.0.0.1:8000",
"value": "https://zoneco.org/api",
"type": "string"
},
{
@@ -711,6 +855,11 @@
"key": "admin_token",
"value": "",
"type": "string"
},
{
"key": "my_email_or_phone",
"value": "ali@example.com",
"type": "string"
}
]
}

View File

@@ -4,9 +4,9 @@ from .models import ContactUs, Composition, Campaign, CompositionImage
@admin.register(ContactUs)
class ContactUsAdmin(admin.ModelAdmin):
list_display = ['name', 'email_or_phone', 'category', 'created_at']
list_display = ['name', 'email_or_phone', 'category', 'has_admin_response', 'created_at']
list_filter = ['category', 'created_at']
search_fields = ['name', 'email_or_phone', 'description']
search_fields = ['name', 'email_or_phone', 'description', 'admin_response']
readonly_fields = ['created_at', 'updated_at']
date_hierarchy = 'created_at'
@@ -17,12 +17,19 @@ class ContactUsAdmin(admin.ModelAdmin):
('پیام', {
'fields': ('description',)
}),
('پاسخ ادمین', {
'fields': ('admin_response',)
}),
('اطلاعات زمانی', {
'fields': ('created_at', 'updated_at'),
'classes': ('collapse',)
}),
)
@admin.display(boolean=True, description='پاسخ ادمین')
def has_admin_response(self, obj):
return bool(obj.admin_response and obj.admin_response.strip())
class CompositionImageInline(admin.TabularInline):
model = CompositionImage

View File

@@ -0,0 +1,22 @@
# Generated by Django 4.2.7 on 2026-07-22 19:20
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('api', '0002_composition_images'),
]
operations = [
migrations.AddField(
model_name='contactus',
name='admin_response',
field=models.TextField(blank=True, default='', help_text='Admin reply visible to the contact submitter', verbose_name='پاسخ ادمین'),
),
migrations.AddIndex(
model_name='contactus',
index=models.Index(fields=['email_or_phone'], name='api_contact_email_o_fedc42_idx'),
),
]

View File

@@ -27,6 +27,12 @@ class ContactUs(models.Model):
choices=CATEGORY_CHOICES,
verbose_name='دسته‌بندی'
)
admin_response = models.TextField(
blank=True,
default='',
verbose_name='پاسخ ادمین',
help_text='Admin reply visible to the contact submitter',
)
created_at = models.DateTimeField(auto_now_add=True, verbose_name='تاریخ ایجاد')
updated_at = models.DateTimeField(auto_now=True, verbose_name='تاریخ بروزرسانی')
@@ -37,6 +43,7 @@ class ContactUs(models.Model):
indexes = [
models.Index(fields=['-created_at']),
models.Index(fields=['category']),
models.Index(fields=['email_or_phone']),
]
def __str__(self):

View File

@@ -32,11 +32,14 @@ class AdminLoginSerializer(serializers.Serializer):
class ContactUsSerializer(serializers.ModelSerializer):
"""
Serializer for ContactUs model.
Public create cannot set admin_response (enforced in the viewset).
"""
class Meta:
model = ContactUs
fields = ['id', 'name', 'email_or_phone', 'description', 'category',
'created_at', 'updated_at']
fields = [
'id', 'name', 'email_or_phone', 'description', 'category',
'admin_response', 'created_at', 'updated_at',
]
read_only_fields = ['id', 'created_at', 'updated_at']
def validate_email_or_phone(self, value):

View File

@@ -6,13 +6,13 @@ from django.core.files.uploadedfile import SimpleUploadedFile
from django.utils import timezone
from PIL import Image
from rest_framework import status
from rest_framework.authtoken.models import Token
from rest_framework.test import APITestCase
from .models import Campaign, Composition, CompositionImage, ContactUs
def make_test_image(name='test.jpg', color='red', size=(100, 100)):
"""Create a minimal valid JPEG for upload tests."""
buffer = io.BytesIO()
Image.new('RGB', size, color=color).save(buffer, format='JPEG')
buffer.seek(0)
@@ -21,6 +21,14 @@ def make_test_image(name='test.jpg', color='red', size=(100, 100)):
class ContactUsAPITests(APITestCase):
def setUp(self):
User = get_user_model()
self.admin = User.objects.create_user(
username='admin_test',
password='test_admin_pass_123',
is_staff=True,
is_superuser=True,
)
self.token = Token.objects.create(user=self.admin)
self.contact = ContactUs.objects.create(
name='Ali Reza',
email_or_phone='ali@example.com',
@@ -28,12 +36,20 @@ class ContactUsAPITests(APITestCase):
category='پشتیبانی',
)
def test_list_contacts(self):
def test_list_contacts_requires_admin(self):
response = self.client.get('/api/contact-us/')
self.assertIn(response.status_code, (
status.HTTP_401_UNAUTHORIZED,
status.HTTP_403_FORBIDDEN,
))
def test_list_contacts_as_admin(self):
self.client.credentials(HTTP_AUTHORIZATION=f'Token {self.token.key}')
response = self.client.get('/api/contact-us/')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['count'], 1)
def test_create_contact(self):
def test_create_contact_public(self):
payload = {
'name': 'Sara',
'email_or_phone': '09121234567',
@@ -43,69 +59,101 @@ class ContactUsAPITests(APITestCase):
response = self.client.post('/api/contact-us/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertEqual(ContactUs.objects.count(), 2)
self.assertEqual(response.data.get('admin_response'), '')
def test_retrieve_contact(self):
response = self.client.get(f'/api/contact-us/{self.contact.id}/')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['name'], 'Ali Reza')
def test_public_cannot_set_admin_response_on_create(self):
payload = {
'name': 'Sara',
'email_or_phone': 'sara@example.com',
'description': 'Hello',
'category': 'سایر',
'admin_response': 'should be ignored',
}
response = self.client.post('/api/contact-us/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
contact = ContactUs.objects.get(pk=response.data['id'])
self.assertEqual(contact.admin_response, '')
def test_by_category(self):
response = self.client.get('/api/contact-us/by_category/?category=پشتیبانی')
def test_mine_contacts(self):
ContactUs.objects.create(
name='Other',
email_or_phone='other@example.com',
description='x',
category='سایر',
)
response = self.client.get(
'/api/contact-us/mine/?email_or_phone=ali@example.com'
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(response.data), 1)
self.assertEqual(response.data[0]['email_or_phone'], 'ali@example.com')
def test_by_category_missing_param(self):
response = self.client.get('/api/contact-us/by_category/')
def test_mine_requires_email_or_phone(self):
response = self.client.get('/api/contact-us/mine/')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
def test_update_requires_auth(self):
response = self.client.patch(
f'/api/contact-us/{self.contact.id}/',
{'name': 'Updated'},
format='json',
)
def test_by_category_requires_admin(self):
response = self.client.get('/api/contact-us/by_category/?category=پشتیبانی')
self.assertIn(response.status_code, (
status.HTTP_401_UNAUTHORIZED,
status.HTTP_403_FORBIDDEN,
))
def test_admin_can_reply(self):
self.client.credentials(HTTP_AUTHORIZATION=f'Token {self.token.key}')
response = self.client.patch(
f'/api/contact-us/{self.contact.id}/',
{'admin_response': 'We will help you.'},
format='json',
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['admin_response'], 'We will help you.')
class CompositionAPITests(APITestCase):
def setUp(self):
User = get_user_model()
self.admin = User.objects.create_user(
username='testadmin', password='testpass123', is_staff=True
username='admin_test',
password='test_admin_pass_123',
is_staff=True,
)
self.token = Token.objects.create(user=self.admin)
self.composition = Composition.objects.create(
name='Test Composition',
description='Test description',
)
def test_list_compositions(self):
def test_list_compositions_public(self):
response = self.client.get('/api/compositions/')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['count'], 1)
def test_create_composition_json(self):
def test_create_composition_requires_admin(self):
payload = {'name': 'New Comp', 'description': 'Desc'}
response = self.client.post('/api/compositions/', payload, format='json')
self.assertIn(response.status_code, (
status.HTTP_401_UNAUTHORIZED,
status.HTTP_403_FORBIDDEN,
))
def test_create_composition_as_admin(self):
self.client.credentials(HTTP_AUTHORIZATION=f'Token {self.token.key}')
payload = {'name': 'New Comp', 'description': 'Desc'}
response = self.client.post('/api/compositions/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertEqual(response.data['name'], 'New Comp')
self.assertEqual(response.data['images'], [])
def test_retrieve_composition(self):
def test_retrieve_composition_public(self):
response = self.client.get(f'/api/compositions/{self.composition.id}/')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertIn('images', response.data)
self.assertIn('main_image', response.data)
self.assertIn('created_at', response.data)
def test_by_created_at(self):
def test_by_created_at_public(self):
now = timezone.now()
Composition.objects.create(
name='Old Composition',
description='Old',
)
Composition.objects.create(name='Old Composition', description='Old')
Composition.objects.filter(name='Old Composition').update(
created_at=now - timedelta(days=10)
)
@@ -118,17 +166,8 @@ class CompositionAPITests(APITestCase):
self.assertIn('Test Composition', names)
self.assertNotIn('Old Composition', names)
def test_by_created_at_missing_params(self):
response = self.client.get('/api/compositions/by-created-at/')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
def test_by_created_at_invalid_datetime(self):
response = self.client.get(
'/api/compositions/by-created-at/?from=not-a-date'
)
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
def test_create_with_multiple_images(self):
def test_create_with_multiple_images_as_admin(self):
self.client.credentials(HTTP_AUTHORIZATION=f'Token {self.token.key}')
img1 = make_test_image('img1.jpg', 'red')
img2 = make_test_image('img2.jpg', 'blue')
response = self.client.post(
@@ -145,12 +184,8 @@ class CompositionAPITests(APITestCase):
self.assertEqual(len(response.data['images']), 2)
self.assertTrue(response.data['main_image']['is_main'])
composition = Composition.objects.get(name='Multi Image')
self.assertEqual(composition.images.count(), 2)
self.assertEqual(composition.main_image.is_main, True)
def test_add_images(self):
self.client.force_authenticate(user=self.admin)
def test_add_images_as_admin(self):
self.client.credentials(HTTP_AUTHORIZATION=f'Token {self.token.key}')
img = make_test_image('added.jpg', 'green')
response = self.client.post(
f'/api/compositions/{self.composition.id}/add-images/',
@@ -159,10 +194,9 @@ class CompositionAPITests(APITestCase):
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(response.data['images']), 1)
self.assertTrue(response.data['main_image']['is_main'])
def test_set_main_image(self):
self.client.force_authenticate(user=self.admin)
def test_set_main_image_as_admin(self):
self.client.credentials(HTTP_AUTHORIZATION=f'Token {self.token.key}')
img1 = CompositionImage.objects.create(
composition=self.composition,
image=make_test_image('a.jpg'),
@@ -184,8 +218,8 @@ class CompositionAPITests(APITestCase):
self.assertFalse(img1.is_main)
self.assertTrue(img2.is_main)
def test_delete_image(self):
self.client.force_authenticate(user=self.admin)
def test_delete_image_as_admin(self):
self.client.credentials(HTTP_AUTHORIZATION=f'Token {self.token.key}')
img = CompositionImage.objects.create(
composition=self.composition,
image=make_test_image('del.jpg'),
@@ -197,20 +231,16 @@ class CompositionAPITests(APITestCase):
self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
self.assertFalse(CompositionImage.objects.filter(pk=img.id).exists())
def test_update_requires_auth(self):
response = self.client.patch(
f'/api/compositions/{self.composition.id}/',
{'name': 'Updated'},
format='json',
)
self.assertIn(response.status_code, (
status.HTTP_401_UNAUTHORIZED,
status.HTTP_403_FORBIDDEN,
))
class CampaignAPITests(APITestCase):
def setUp(self):
User = get_user_model()
self.admin = User.objects.create_user(
username='admin_test',
password='test_admin_pass_123',
is_staff=True,
)
self.token = Token.objects.create(user=self.admin)
now = timezone.now()
self.active = Campaign.objects.create(
name='Active Campaign',
@@ -231,12 +261,27 @@ class CampaignAPITests(APITestCase):
end_time=now - timedelta(days=5),
)
def test_list_campaigns(self):
def test_list_campaigns_public(self):
response = self.client.get('/api/campaigns/')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['count'], 3)
def test_create_campaign(self):
def test_create_campaign_requires_admin(self):
now = timezone.now()
payload = {
'name': 'New Campaign',
'description': 'Desc',
'start_time': (now + timedelta(days=1)).isoformat(),
'end_time': (now + timedelta(days=3)).isoformat(),
}
response = self.client.post('/api/campaigns/', payload, format='json')
self.assertIn(response.status_code, (
status.HTTP_401_UNAUTHORIZED,
status.HTTP_403_FORBIDDEN,
))
def test_create_campaign_as_admin(self):
self.client.credentials(HTTP_AUTHORIZATION=f'Token {self.token.key}')
now = timezone.now()
payload = {
'name': 'New Campaign',
@@ -247,19 +292,16 @@ class CampaignAPITests(APITestCase):
response = self.client.post('/api/campaigns/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
def test_retrieve_campaign(self):
def test_retrieve_campaign_public(self):
response = self.client.get(f'/api/campaigns/{self.active.id}/')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertTrue(response.data['is_active'])
self.assertFalse(response.data['is_upcoming'])
self.assertFalse(response.data['is_ended'])
def test_active_campaigns(self):
response = self.client.get('/api/campaigns/active/')
self.assertEqual(response.status_code, status.HTTP_200_OK)
names = [item['name'] for item in response.data]
self.assertIn('Active Campaign', names)
self.assertNotIn('Upcoming Campaign', names)
def test_upcoming_campaigns(self):
response = self.client.get('/api/campaigns/upcoming/')
@@ -273,17 +315,6 @@ class CampaignAPITests(APITestCase):
names = [item['name'] for item in response.data]
self.assertIn('Ended Campaign', names)
def test_create_campaign_invalid_dates(self):
now = timezone.now()
payload = {
'name': 'Bad Dates',
'description': 'Desc',
'start_time': (now + timedelta(days=3)).isoformat(),
'end_time': (now + timedelta(days=1)).isoformat(),
}
response = self.client.post('/api/campaigns/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
class AdminLoginAPITests(APITestCase):
def setUp(self):
@@ -311,7 +342,6 @@ class AdminLoginAPITests(APITestCase):
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertIn('token', response.data)
self.assertEqual(response.data['user']['username'], self.admin_username)
self.assertTrue(response.data['user']['is_staff'])
def test_admin_login_wrong_password(self):
response = self.client.post(
@@ -341,34 +371,6 @@ class AdminLoginAPITests(APITestCase):
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['username'], self.admin_username)
def test_admin_me_requires_auth(self):
response = self.client.get('/api/admin/me/')
self.assertIn(response.status_code, (
status.HTTP_401_UNAUTHORIZED,
status.HTTP_403_FORBIDDEN,
))
def test_token_allows_protected_update(self):
contact = ContactUs.objects.create(
name='Old Name',
email_or_phone='a@b.com',
description='msg',
category='سایر',
)
login = self.client.post(
'/api/admin/login/',
{'username': self.admin_username, 'password': self.admin_password},
format='json',
)
self.client.credentials(HTTP_AUTHORIZATION=f'Token {login.data["token"]}')
response = self.client.patch(
f'/api/contact-us/{contact.id}/',
{'name': 'New Name'},
format='json',
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['name'], 'New Name')
def test_admin_logout(self):
login = self.client.post(
'/api/admin/login/',
@@ -379,8 +381,6 @@ class AdminLoginAPITests(APITestCase):
self.client.credentials(HTTP_AUTHORIZATION=f'Token {token}')
response = self.client.post('/api/admin/logout/')
self.assertEqual(response.status_code, status.HTTP_200_OK)
# Token should no longer work
response = self.client.get('/api/admin/me/')
self.assertIn(response.status_code, (
status.HTTP_401_UNAUTHORIZED,

View File

@@ -1,11 +1,10 @@
from rest_framework import viewsets, status
from rest_framework.decorators import action, api_view, permission_classes
from rest_framework.response import Response
from rest_framework.permissions import AllowAny, IsAuthenticated
from rest_framework.permissions import AllowAny, IsAuthenticated, IsAdminUser
from rest_framework.parsers import MultiPartParser, FormParser, JSONParser
from rest_framework.authtoken.models import Token
from django.shortcuts import get_object_or_404
from django.db.models import Q
from django.utils import timezone
from django.utils.dateparse import parse_datetime
from .models import ContactUs, Composition, Campaign, CompositionImage
@@ -13,7 +12,6 @@ from .serializers import (
ContactUsSerializer,
CompositionSerializer,
CampaignSerializer,
CompositionImageSerializer,
AdminLoginSerializer,
)
@@ -43,7 +41,7 @@ def admin_login(request):
@api_view(['POST'])
@permission_classes([IsAuthenticated])
@permission_classes([IsAdminUser])
def admin_logout(request):
"""Delete the current admin auth token (logout)."""
Token.objects.filter(user=request.user).delete()
@@ -51,7 +49,7 @@ def admin_logout(request):
@api_view(['GET'])
@permission_classes([IsAuthenticated])
@permission_classes([IsAdminUser])
def admin_me(request):
"""Return the currently authenticated admin user."""
user = request.user
@@ -66,24 +64,47 @@ def admin_me(request):
class ContactUsViewSet(viewsets.ModelViewSet):
"""
ViewSet for ContactUs model.
Provides CRUD operations for contact form submissions.
Contact Us permissions:
- Public: create a message, and view own messages via /mine/
- Admin: list all, retrieve, update (including admin_response), delete
"""
queryset = ContactUs.objects.all()
serializer_class = ContactUsSerializer
permission_classes = [AllowAny] # Allow anyone to submit contact forms
permission_classes = [IsAdminUser]
def get_permissions(self):
"""
Override to allow GET (list, retrieve) and POST (create) for anyone.
"""
if self.action in ['list', 'retrieve', 'create', 'by_category']:
if self.action in ['create', 'mine']:
return [AllowAny()]
return [IsAuthenticated()]
return [IsAdminUser()]
def get_serializer(self, *args, **kwargs):
serializer = super().get_serializer(*args, **kwargs)
# Public create cannot set admin_response
if self.action == 'create' and not (
self.request.user and self.request.user.is_staff
):
serializer.fields['admin_response'].read_only = True
return serializer
@action(detail=False, methods=['get'])
def mine(self, request):
"""
Public: list contacts for a given email_or_phone (own submissions),
including admin_response.
"""
email_or_phone = (request.query_params.get('email_or_phone') or '').strip()
if not email_or_phone:
return Response(
{'error': 'email_or_phone query parameter is required.'},
status=status.HTTP_400_BAD_REQUEST,
)
contacts = self.queryset.filter(email_or_phone__iexact=email_or_phone)
serializer = self.get_serializer(contacts, many=True)
return Response(serializer.data)
@action(detail=False, methods=['get'])
def by_category(self, request):
"""Get contacts filtered by category."""
"""Admin: get contacts filtered by category."""
category = request.query_params.get('category', None)
if category:
contacts = self.queryset.filter(category=category)
@@ -97,35 +118,28 @@ class ContactUsViewSet(viewsets.ModelViewSet):
class CompositionViewSet(viewsets.ModelViewSet):
"""
ViewSet for Composition model.
Supports uploading one or more images at create/update time via the
multipart ``uploaded_images`` field, with an optional ``main_image_index``
to flag the main image. Extra actions allow adding images, choosing the
main image, and deleting an image after creation.
Compositions (مقالات):
- Public: list, retrieve, by-created-at
- Admin: create, update, delete, manage images
"""
queryset = Composition.objects.prefetch_related('images').all()
serializer_class = CompositionSerializer
permission_classes = [AllowAny] # Public read access
permission_classes = [IsAdminUser]
parser_classes = [MultiPartParser, FormParser, JSONParser]
def get_permissions(self):
"""
Override to allow GET (list, retrieve) and POST (create) for anyone.
"""
if self.action in ['list', 'retrieve', 'create', 'by_created_at']:
if self.action in ['list', 'retrieve', 'by_created_at']:
return [AllowAny()]
return [IsAuthenticated()]
return [IsAdminUser()]
def get_serializer_context(self):
"""Add request to serializer context for image URL generation."""
context = super().get_serializer_context()
context['request'] = self.request
return context
@action(detail=False, methods=['get'], url_path='by-created-at')
def by_created_at(self, request):
"""Get compositions filtered by created_at date range."""
"""Public: compositions filtered by created_at date range."""
from_param = request.query_params.get('from')
to_param = request.query_params.get('to')
@@ -163,7 +177,6 @@ class CompositionViewSet(viewsets.ModelViewSet):
return Response(serializer.data)
def _composition_response(self, composition):
"""Return a fresh composition payload with up-to-date images."""
composition = Composition.objects.prefetch_related('images').get(
pk=composition.pk
)
@@ -171,7 +184,7 @@ class CompositionViewSet(viewsets.ModelViewSet):
@action(detail=True, methods=['post'], url_path='add-images')
def add_images(self, request, pk=None):
"""Add one or more images to an existing composition."""
"""Admin: add one or more images to an existing composition."""
composition = self.get_object()
serializer = self.get_serializer(
composition, data=request.data, partial=True
@@ -182,7 +195,7 @@ class CompositionViewSet(viewsets.ModelViewSet):
@action(detail=True, methods=['post'], url_path='set-main-image')
def set_main_image(self, request, pk=None):
"""Flag one of the composition's images as the main image."""
"""Admin: flag one image as the main image."""
composition = self.get_object()
image_id = request.data.get('image_id')
if image_id is None:
@@ -194,7 +207,7 @@ class CompositionViewSet(viewsets.ModelViewSet):
CompositionImage, pk=image_id, composition=composition
)
image.is_main = True
image.save() # model.save() unsets is_main on the other images
image.save()
return Response(self._composition_response(composition))
@action(
@@ -203,7 +216,7 @@ class CompositionViewSet(viewsets.ModelViewSet):
url_path='images/(?P<image_id>[^/.]+)'
)
def delete_image(self, request, pk=None, image_id=None):
"""Delete a single image from the composition."""
"""Admin: delete a single image from the composition."""
composition = self.get_object()
image = get_object_or_404(
CompositionImage, pk=image_id, composition=composition
@@ -214,30 +227,26 @@ class CompositionViewSet(viewsets.ModelViewSet):
class CampaignViewSet(viewsets.ModelViewSet):
"""
ViewSet for Campaign model.
Provides CRUD operations for campaigns.
Campaigns:
- Public: list, retrieve, active, upcoming, ended
- Admin: create, update, delete
"""
queryset = Campaign.objects.all()
serializer_class = CampaignSerializer
permission_classes = [AllowAny] # Public read access
permission_classes = [IsAdminUser]
def get_permissions(self):
"""
Override to allow GET (list, retrieve) and POST (create) for anyone.
"""
if self.action in ['list', 'retrieve', 'create', 'active', 'upcoming', 'ended']:
if self.action in ['list', 'retrieve', 'active', 'upcoming', 'ended']:
return [AllowAny()]
return [IsAuthenticated()]
return [IsAdminUser()]
def get_serializer_context(self):
"""Add request to serializer context for image URL generation."""
context = super().get_serializer_context()
context['request'] = self.request
return context
@action(detail=False, methods=['get'])
def active(self, request):
"""Get all currently active campaigns."""
now = timezone.now()
active_campaigns = self.queryset.filter(
start_time__lte=now,
@@ -248,7 +257,6 @@ class CampaignViewSet(viewsets.ModelViewSet):
@action(detail=False, methods=['get'])
def upcoming(self, request):
"""Get all upcoming campaigns."""
now = timezone.now()
upcoming_campaigns = self.queryset.filter(start_time__gt=now)
serializer = self.get_serializer(upcoming_campaigns, many=True)
@@ -256,7 +264,6 @@ class CampaignViewSet(viewsets.ModelViewSet):
@action(detail=False, methods=['get'])
def ended(self, request):
"""Get all ended campaigns."""
now = timezone.now()
ended_campaigns = self.queryset.filter(end_time__lt=now)
serializer = self.get_serializer(ended_campaigns, many=True)