diff --git a/.gitignore b/.gitignore index 5f9cd5a..171860e 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ wheels/ # Virtual environments .venv/ +venvArvin/ venv/ ENV/ env/ diff --git a/addresses/__init__.py b/addresses/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/addresses/admin.py b/addresses/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/addresses/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/addresses/apps.py b/addresses/apps.py new file mode 100644 index 0000000..a6784fa --- /dev/null +++ b/addresses/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class AddressesConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'addresses' diff --git a/addresses/migrations/__init__.py b/addresses/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/addresses/models.py b/addresses/models.py new file mode 100644 index 0000000..3ef4c52 --- /dev/null +++ b/addresses/models.py @@ -0,0 +1,38 @@ +from django.db import models + + +class Province(models.Model): + province_id = models.IntegerField(primary_key=True) + province_name = models.CharField(max_length=255) + + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + def __str__(self) -> str: + return f"{self.province_name}" + +class City(models.Model): + province = models.ForeignKey("Province", on_delete=models.CASCADE, related_name="city") + city_id = models.IntegerField(primary_key=True) + city_name = models.CharField(max_length=255) + + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + def __str__(self) -> str: + return f"{self.city_name}" + + + + +class Address(models.Model): + province = models.ForeignKey("Province", on_delete=models.CASCADE, related_name="province") + city = models.ForeignKey("City", on_delete=models.CASCADE, related_name="city") + address_detail = models.TextField() + + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + def __str__(self) -> str: + return f"{self.address_detail[:10]}..." + \ No newline at end of file diff --git a/addresses/tests.py b/addresses/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/addresses/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/addresses/views.py b/addresses/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/addresses/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/celerybeat-schedule b/celerybeat-schedule index 289f8ae..0c013ab 100644 Binary files a/celerybeat-schedule and b/celerybeat-schedule differ diff --git a/docker-compose.yaml b/docker-compose.yaml index 14dfd87..af0b0af 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -66,7 +66,7 @@ services: ports: - "8000:8000" env_file: - - .env + - .env.example environment: DOCKER_VERSION: ${DOCKER_VERSION:-develop} ALLOWED_HOSTS: ${ALLOWED_HOSTS:-localhost,127.0.0.1,0.0.0.0,web,backend-web} @@ -101,7 +101,7 @@ services: - .:/app - ./logs:/app/logs env_file: - - .env + - .env.example environment: DOCKER_VERSION: ${DOCKER_VERSION:-develop} ALLOWED_HOSTS: ${ALLOWED_HOSTS:-localhost,127.0.0.1,0.0.0.0,web,backend-web} @@ -135,7 +135,7 @@ services: - .:/app - ./logs:/app/logs env_file: - - .env + - .env.example environment: DOCKER_VERSION: ${DOCKER_VERSION:-develop} ALLOWED_HOSTS: ${ALLOWED_HOSTS:-localhost,127.0.0.1,0.0.0.0,web,backend-web}