diff --git a/Shops/travel_guide_store/Homeworks/animals.py b/Shops/travel_guide_store/Homeworks/animals.py deleted file mode 100644 index 5a20e94..0000000 --- a/Shops/travel_guide_store/Homeworks/animals.py +++ /dev/null @@ -1,46 +0,0 @@ -""" -1. Животный мир: -- у собаки есть имя, возраст и любимая команда(например сидеть). - Собака может лаять, то есть выводить в консоль - "Hello, I'm {name}, and I'm woofing! My favorite command is {command}!" -- у кота есть имя, возраст и любимое место . - Кот может мяукать, то есть выводить в консоль - "Hello, I'm {name}, and I'm meowing! My favorite place is {fav_place}!" -- и у котов, и у собак есть метод presentate(), -который выводит следующее сообщение: - 'My name is {name}, my age is {age}' - -""" -class Animals (): - def __init__ (self, name, age): - self.name = name - self.age = age - - def presentate(self): - return f'My name is {self.name}, my age is {self.age}' - - -class Cat(Animals): - def __init__(self, name:str, age: int, fav_place: str): - self.fav_place = fav_place - super().__init__(name=name, age=age) - - def introduce(self): - return f"Hello, I'm {self.name}, and I'm meowing! My favorite place is {self.fav_place}!" - - -class Dog(Animals): - def __init__(self, name:str, age:int, command:str): - self.command = command - super().__init__(name=name, age=age) - - def introduce(self): - return f"Hello, I'm {self.name}, and I'm woofing! My favorite command is {self.command}!" - -# проверка -cat1 = Cat("Tom", 3, "window") -dog1 = Dog("Duk", 5, "Take it!") -print(cat1.introduce()) -print(dog1.introduce()) -cat2=Cat("Mishel", 5, "bed") -print(cat2.presentate()) \ No newline at end of file diff --git a/Shops/travel_guide_store/Homeworks/bank/bank/__init__.py b/Shops/travel_guide_store/Homeworks/bank/bank/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Shops/travel_guide_store/Homeworks/bank/bank/asgi.py b/Shops/travel_guide_store/Homeworks/bank/bank/asgi.py new file mode 100644 index 0000000..72fa3e6 --- /dev/null +++ b/Shops/travel_guide_store/Homeworks/bank/bank/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for bank project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/4.0/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'bank.settings') + +application = get_asgi_application() diff --git a/Shops/travel_guide_store/Homeworks/bank/bank/settings.py b/Shops/travel_guide_store/Homeworks/bank/bank/settings.py new file mode 100644 index 0000000..7eef756 --- /dev/null +++ b/Shops/travel_guide_store/Homeworks/bank/bank/settings.py @@ -0,0 +1,127 @@ +""" +Django settings for bank project. + +Generated by 'django-admin startproject' using Django 4.0.5. + +For more information on this file, see +https://docs.djangoproject.com/en/4.0/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/4.0/ref/settings/ +""" + +from pathlib import Path + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'django-insecure-v7i7i!ra(37f65ile5u4_+1=akj$0ty62i**(e6cgegzpa@grp' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'cards', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'bank.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'bank.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/4.0/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'bank', + 'USER': 'user1', + 'PASSWORD': 'user1', + 'PORT' : 5433, + } +} + + +# Password validation +# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/4.0/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/4.0/howto/static-files/ + +STATIC_URL = 'static/' + +# Default primary key field type +# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/Shops/travel_guide_store/Homeworks/bank/bank/urls.py b/Shops/travel_guide_store/Homeworks/bank/bank/urls.py new file mode 100644 index 0000000..d54e736 --- /dev/null +++ b/Shops/travel_guide_store/Homeworks/bank/bank/urls.py @@ -0,0 +1,21 @@ +"""bank URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/4.0/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.contrib import admin +from django.urls import path + +urlpatterns = [ + path('admin/', admin.site.urls), +] diff --git a/Shops/travel_guide_store/Homeworks/bank/bank/wsgi.py b/Shops/travel_guide_store/Homeworks/bank/bank/wsgi.py new file mode 100644 index 0000000..f3bedaf --- /dev/null +++ b/Shops/travel_guide_store/Homeworks/bank/bank/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for bank project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/4.0/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'bank.settings') + +application = get_wsgi_application() diff --git a/Shops/travel_guide_store/Homeworks/bank/cards/__init__.py b/Shops/travel_guide_store/Homeworks/bank/cards/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Shops/travel_guide_store/Homeworks/bank/cards/admin.py b/Shops/travel_guide_store/Homeworks/bank/cards/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/Shops/travel_guide_store/Homeworks/bank/cards/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/Shops/travel_guide_store/Homeworks/bank/cards/apps.py b/Shops/travel_guide_store/Homeworks/bank/cards/apps.py new file mode 100644 index 0000000..2bdcb50 --- /dev/null +++ b/Shops/travel_guide_store/Homeworks/bank/cards/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class CardsConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'cards' diff --git a/Shops/travel_guide_store/Homeworks/bank/cards/migrations/0001_initial.py b/Shops/travel_guide_store/Homeworks/bank/cards/migrations/0001_initial.py new file mode 100644 index 0000000..e66b229 --- /dev/null +++ b/Shops/travel_guide_store/Homeworks/bank/cards/migrations/0001_initial.py @@ -0,0 +1,52 @@ +# Generated by Django 4.0.5 on 2022-07-22 07:25 + +import datetime +from django.db import migrations, models +import django.db.models.deletion +import uuid + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Account', + fields=[ + ('iban', models.UUIDField(default=uuid.UUID('c62fa4d0-ee2d-4551-8dad-082520b02c5d'), primary_key=True, serialize=False)), + ('sum', models.PositiveIntegerField(default=0)), + ], + options={ + 'db_table': 'accounts', + }, + ), + migrations.CreateModel( + name='User', + fields=[ + ('name', models.CharField(max_length=255)), + ('age', models.IntegerField()), + ('uuid', models.UUIDField(default=uuid.UUID('aad122b5-7aa2-4fb1-9b8d-c94f002510eb'), primary_key=True, serialize=False)), + ], + options={ + 'db_table': 'users', + }, + ), + migrations.CreateModel( + name='Card', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('number', models.PositiveBigIntegerField(max_length=16)), + ('expiration_date', models.DateField(default=datetime.date(2025, 7, 22))), + ('cvv', models.IntegerField(max_length=3)), + ('account', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cards.account')), + ('user_name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cards.user')), + ], + options={ + 'db_table': 'cards', + }, + ), + ] diff --git a/Shops/travel_guide_store/Homeworks/bank/cards/migrations/__init__.py b/Shops/travel_guide_store/Homeworks/bank/cards/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Shops/travel_guide_store/Homeworks/bank/cards/models.py b/Shops/travel_guide_store/Homeworks/bank/cards/models.py new file mode 100644 index 0000000..3cd814b --- /dev/null +++ b/Shops/travel_guide_store/Homeworks/bank/cards/models.py @@ -0,0 +1,32 @@ +from django.db import models +from uuid import uuid4 +from datetime import date +from dateutil.relativedelta import relativedelta + +# Create your models here. +class Card(models.Model): + number = models.PositiveBigIntegerField(max_length=16, null=False) + expiration_date = models.DateField(default=(date.today() + relativedelta(years=3))) + user_name = models.ForeignKey('User', on_delete=models.CASCADE, null=False) + account = models.ForeignKey('Account', on_delete=models.CASCADE, null=False) + cvv = models.IntegerField(null=False, max_length=3) + + class Meta: + db_table = 'cards' + + +class Account(models.Model): + iban = models.UUIDField(primary_key=True, default=uuid4()) + sum = models.PositiveIntegerField(default=0) + + class Meta: + db_table = 'accounts' + + +class User(models.Model): + name = models.CharField(max_length=255, null=False) + age = models.IntegerField(null=False) + uuid = models.UUIDField(default=uuid4(), primary_key=True) + + class Meta: + db_table = 'users' diff --git a/Shops/travel_guide_store/Homeworks/bank/cards/tests.py b/Shops/travel_guide_store/Homeworks/bank/cards/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/Shops/travel_guide_store/Homeworks/bank/cards/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/Shops/travel_guide_store/Homeworks/bank/cards/urls.py b/Shops/travel_guide_store/Homeworks/bank/cards/urls.py new file mode 100644 index 0000000..26bb661 --- /dev/null +++ b/Shops/travel_guide_store/Homeworks/bank/cards/urls.py @@ -0,0 +1,7 @@ +from django.urls import path +from .views import get_all_cards, get_all_account + +urlpatterns = [ + path('users//cards', view=get_all_cards), + path('users//accounts', view=get_all_account), +] \ No newline at end of file diff --git a/Shops/travel_guide_store/Homeworks/bank/cards/views.py b/Shops/travel_guide_store/Homeworks/bank/cards/views.py new file mode 100644 index 0000000..b393c59 --- /dev/null +++ b/Shops/travel_guide_store/Homeworks/bank/cards/views.py @@ -0,0 +1,14 @@ +from django.shortcuts import render +from django.http import HttpResponse +from .models import Account, Card + + +# Create your views here. +def get_all_cards(request, user_uuid): + data = Card.objects.filter(iban=user_uuid) + return HttpResponse(*data.values()) + + +def get_all_account(request, user_uuid): + data = Account.objects.filter(iban=user_uuid) + return HttpResponse(*data.values()) \ No newline at end of file diff --git a/Shops/travel_guide_store/Homeworks/bank/manage.py b/Shops/travel_guide_store/Homeworks/bank/manage.py new file mode 100644 index 0000000..2ebdc79 --- /dev/null +++ b/Shops/travel_guide_store/Homeworks/bank/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'bank.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/Shops/travel_guide_store/Homeworks/managment.py b/Shops/travel_guide_store/Homeworks/managment.py deleted file mode 100644 index f7266e7..0000000 --- a/Shops/travel_guide_store/Homeworks/managment.py +++ /dev/null @@ -1,50 +0,0 @@ -"""2. Система менеджмента сотрудников. -- Человек имеет имя, uuid, возраст -- Работник - это человек, у которого есть роль - в компании и стаж работы, работник может выполнять задачу, - если она его из его сферы и у него достаточно опыта для - выполнения задачи. Если сотрудник может выполнить задачу, - в консоль выводится: - Task {task_description} is done! - если выполнить не может, то - Task {task_description} is not for me. -- Задача имеет описание, сферу(разработка, бухгалтерия, hr, кадры...), - а также уровень исполнителя, например 5 значит, что только работник - с опытом 5 лет может ее исполнить""" - -from uuid import uuid4 - -class Person: - def __init__ (self, uuid:uuid4(), name: str, age: int): - self.uuid = uuid4() - self.name = name - self.age = age - -class Task: - def __init__ (self, description:str, sector:str, level:int): - self.description = description - self.sector = sector - self.level = level - -class Employee(Person): - def __init__ (self, name:str, age: int, role: str, experience: int, sector: str): - super().__init__(self, name, age) - self.role = role - self.experience = experience - self.sector = sector - - - def operation(self, task: Task): - result = "" - if (self.experience >= task.level) and (self.sector == task.sector): - result = f'Task {task.description} is done!' - else: - result = f'Task {task.description} is not for me.' - return result - - -# проверка -chel1 = Employee( "Petr", 39, "Master", 18, "STO") -print(chel1.operation(Task("Починить авто", "STO", 15))) -print(chel1.operation(Task("Починить авто", "IT", 3))) -print(chel1.uuid) \ No newline at end of file