Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mvp #69

Merged
merged 163 commits into from
Mar 10, 2024
Merged

mvp #69

Changes from 1 commit
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
325186d
add registration and authentication
qwertttyyy Feb 23, 2024
07523e3
Added docker compose local version
antonata-c Feb 23, 2024
451f943
Added backend dockerfile and env handling
antonata-c Feb 23, 2024
34a09a6
Revert "Added backend dockerfile and env handling"
antonata-c Feb 23, 2024
2fa506d
Revert "Revert "Added backend dockerfile and env handling""
antonata-c Feb 23, 2024
5e3c526
Added static gitignore
antonata-c Feb 23, 2024
055a1bd
Reworked gunicorn to default server startup
antonata-c Feb 23, 2024
f489864
made edits
qwertttyyy Feb 23, 2024
3b991d4
added ambassadors app and models
ragimov700 Feb 23, 2024
7245d90
Merge pull request #7 from Tenth-Team/local_docker
ragimov700 Feb 23, 2024
d8891c8
Merge branch 'develop' into feature/users
ragimov700 Feb 23, 2024
43fa2d4
Merge pull request #6 from Tenth-Team/feature/users
ragimov700 Feb 23, 2024
b6733f3
Merge branch 'develop' into ambassadors
ragimov700 Feb 23, 2024
69b0cc2
Merge pull request #8 from Tenth-Team/ambassadors
ragimov700 Feb 23, 2024
0620fa2
base api config
ragimov700 Feb 24, 2024
7e15ab9
Merge pull request #9 from Tenth-Team/api
ragimov700 Feb 24, 2024
8340933
CI
VadimGurzhy Feb 24, 2024
2a690b6
ambassador viewset and serializer
ragimov700 Feb 24, 2024
6809dfb
Merge pull request #10 from Tenth-Team/CI
ragimov700 Feb 24, 2024
27e6339
Merge pull request #14 from Tenth-Team/api-amb
ragimov700 Feb 24, 2024
96416b9
Added static_root and daphne
antonata-c Feb 25, 2024
a2bc11f
Added docker-compose for production
antonata-c Feb 25, 2024
87acce2
Fixed backend compose command
antonata-c Feb 25, 2024
3053170
Merge pull request #15 from Tenth-Team/docker_prod
ragimov700 Feb 26, 2024
eaed660
added Content model
qwertttyyy Feb 26, 2024
53c6c53
integration with yandex forms
ragimov700 Feb 27, 2024
7c0f413
Merge pull request #17 from Tenth-Team/api-amb
ragimov700 Feb 27, 2024
27f972b
added csrf setting
ragimov700 Feb 27, 2024
0186be1
models settings
ragimov700 Feb 27, 2024
10b2797
config admin for ambassadors
ragimov700 Feb 27, 2024
1657afd
Merge pull request #18 from Tenth-Team/settings
ragimov700 Feb 27, 2024
768619f
fix github workflow
ragimov700 Feb 27, 2024
8696e8b
fix github workflow
ragimov700 Feb 27, 2024
50c8001
fix github workflow
ragimov700 Feb 27, 2024
4098e1c
fix github workflow
ragimov700 Feb 27, 2024
3d10ec9
flake8 fix
ragimov700 Feb 27, 2024
2f87fb3
imports fix
ragimov700 Feb 27, 2024
33d3744
Merge pull request #20 from Tenth-Team/settings
ragimov700 Feb 27, 2024
e1191cc
Delete migration
qwertttyyy Feb 28, 2024
514c744
Merge branch 'develop' into feature/content
qwertttyyy Feb 28, 2024
f125111
Update admin.py
qwertttyyy Feb 28, 2024
7a3dcb6
fix imports
qwertttyyy Feb 28, 2024
8fd4abd
fix imports
qwertttyyy Feb 28, 2024
95c14c2
fix imports
qwertttyyy Feb 28, 2024
359dcbb
fix imports
qwertttyyy Feb 28, 2024
95955da
fix Meta and str
qwertttyyy Feb 28, 2024
83885f3
fix Meta and str
qwertttyyy Feb 28, 2024
5b4f008
Merge pull request #16 from Tenth-Team/feature/content
ragimov700 Feb 29, 2024
52ca22e
telegram username format
ragimov700 Feb 29, 2024
db8074b
fix flake8
ragimov700 Feb 29, 2024
8f0edc2
fix isort
ragimov700 Feb 29, 2024
dd5d6a1
Merge pull request #22 from Tenth-Team/amb
ragimov700 Feb 29, 2024
1609f93
added content create option
qwertttyyy Feb 29, 2024
b3dde65
added telegram field validation
qwertttyyy Feb 29, 2024
6c3e5e1
added content filtering
qwertttyyy Feb 29, 2024
e2fdbc1
added docs
qwertttyyy Feb 29, 2024
6f4d95f
added docs
qwertttyyy Feb 29, 2024
e0029f3
Модели мерча и заявки на отправку
VadimGurzhy Mar 1, 2024
c1f175f
поправил импорты по pep8
VadimGurzhy Mar 1, 2024
7c1c73a
fix isort2
VadimGurzhy Mar 1, 2024
da3dbfa
added docs
qwertttyyy Mar 1, 2024
d2404a5
pep fix
qwertttyyy Mar 1, 2024
555d462
serializers for ambassador
ragimov700 Mar 2, 2024
11aa5b0
Merge pull request #23 from Tenth-Team/model_merch
ragimov700 Mar 2, 2024
cc0d432
Merge branch 'develop' into feature/content_integration
ragimov700 Mar 2, 2024
9ee3f56
Merge pull request #24 from Tenth-Team/feature/content_integration
ragimov700 Mar 2, 2024
58a1d51
Merge branch 'develop' into docs
ragimov700 Mar 2, 2024
2cc559e
Merge branch 'develop' into amb
ragimov700 Mar 2, 2024
7802a31
fix requierements
ragimov700 Mar 2, 2024
eeebc55
fix imports
ragimov700 Mar 2, 2024
28d81ee
fix imports
ragimov700 Mar 2, 2024
99f2efe
Merge pull request #27 from Tenth-Team/amb
ragimov700 Mar 2, 2024
a2e5818
Merge branch 'develop' into docs
ragimov700 Mar 2, 2024
28da320
Merge pull request #26 from Tenth-Team/docs
ragimov700 Mar 2, 2024
7d6e845
fix merch
ragimov700 Mar 2, 2024
cb22204
Merge pull request #28 from Tenth-Team/amb
ragimov700 Mar 2, 2024
fc27206
fix parsing amb_goals
ragimov700 Mar 2, 2024
b9ac717
Added promocode model, viewset, serializer, signal
antonata-c Mar 2, 2024
0cefdd2
Flake8
antonata-c Mar 2, 2024
e65e0fc
Merge pull request #30 from Tenth-Team/promocodes
ragimov700 Mar 2, 2024
5300704
Merge pull request #29 from Tenth-Team/amb
ragimov700 Mar 2, 2024
b4dcb67
added docs for content
qwertttyyy Mar 3, 2024
b8c88d3
Merge branch 'develop' into docs/content
ragimov700 Mar 3, 2024
292765b
Merge pull request #31 from Tenth-Team/docs/content
ragimov700 Mar 3, 2024
f765250
minor fixes
ragimov700 Mar 3, 2024
cac8792
permissions for yandex forms and fixes
ragimov700 Mar 3, 2024
40dc2bf
fix imports
ragimov700 Mar 3, 2024
c6ae54f
Merge pull request #33 from Tenth-Team/amb
ragimov700 Mar 3, 2024
2cd8019
рабочий ендпоинт на заявку
VadimGurzhy Mar 3, 2024
fe51430
schema вынесена в отдельный файл, добавлен пермишен isAuthenticated
VadimGurzhy Mar 3, 2024
743937a
Added promo_code short_serializer
antonata-c Mar 3, 2024
49e33f6
Fixed showing inactive promo_code
antonata-c Mar 3, 2024
0b3891a
ambassador pagination
ragimov700 Mar 4, 2024
db65c05
ambassador filters
ragimov700 Mar 4, 2024
0ec951c
reworked the filtering
qwertttyyy Mar 4, 2024
a44b6bf
filters
ragimov700 Mar 4, 2024
20dcd11
fix linter
ragimov700 Mar 4, 2024
ddb09f1
Merge pull request #37 from Tenth-Team/amb
ragimov700 Mar 4, 2024
602528f
cors config
ragimov700 Mar 5, 2024
9df9da0
Merge pull request #38 from Tenth-Team/cors
ragimov700 Mar 5, 2024
c377f73
create amb serializer
ragimov700 Mar 5, 2024
085a0b1
content count, and fix content model
ragimov700 Mar 5, 2024
ccc3776
fix
ragimov700 Mar 5, 2024
025d625
Merge pull request #39 from Tenth-Team/tests
ragimov700 Mar 5, 2024
23d6702
Merge pull request #35 from Tenth-Team/promocodes
ragimov700 Mar 5, 2024
c769408
Merge branch 'develop' into Endpoint_MerchandiseRequest
ragimov700 Mar 5, 2024
2493fd8
Merge pull request #34 from Tenth-Team/Endpoint_MerchandiseRequest
ragimov700 Mar 6, 2024
57c8e3d
fix migrations
ragimov700 Mar 6, 2024
883f5a0
added dumpdata
ragimov700 Mar 6, 2024
2e84de7
Merge pull request #43 from Tenth-Team/dumpdata
ragimov700 Mar 6, 2024
85b50c4
fixes
ragimov700 Mar 6, 2024
5e7ec8e
Merge pull request #44 from Tenth-Team/fixes
ragimov700 Mar 6, 2024
7b59bde
added loyalty get method
qwertttyyy Mar 6, 2024
a6dbdbe
added docstrings
qwertttyyy Mar 6, 2024
44d1b5e
Merge branch 'develop' into feature/loyalty
qwertttyyy Mar 6, 2024
f5ad991
Pre-commit with working documentation
antonata-c Mar 6, 2024
3eac2df
fix conflicts
qwertttyyy Mar 6, 2024
95035f4
views for training programs and goals
ragimov700 Mar 7, 2024
7cee17a
factories and tests for ambassadors
ragimov700 Mar 7, 2024
13f1ceb
tests for utils
ragimov700 Mar 7, 2024
174e07e
fix flake8
ragimov700 Mar 7, 2024
f382e21
Merge pull request #47 from Tenth-Team/amb
ragimov700 Mar 7, 2024
69eee1e
fix requierements and config ci for django tests
ragimov700 Mar 7, 2024
3e7ecc0
Merge pull request #48 from Tenth-Team/amb
ragimov700 Mar 7, 2024
6818ad0
Merge branch 'develop' into feature/loyalty
ragimov700 Mar 7, 2024
e2c7e44
fix flake8
ragimov700 Mar 7, 2024
b8946cd
fix flake8
ragimov700 Mar 7, 2024
4d1ce28
fix admin conflict
ragimov700 Mar 7, 2024
6904a5c
Merge pull request #45 from Tenth-Team/feature/loyalty
ragimov700 Mar 7, 2024
e1d86b6
fix serializer and filters
ragimov700 Mar 7, 2024
7c2f027
fix
ragimov700 Mar 7, 2024
13bb097
Merge pull request #49 from Tenth-Team/amb
ragimov700 Mar 7, 2024
ddfe3ad
Improved OpenAPI docs
antonata-c Mar 7, 2024
9f92176
queries optimized
ragimov700 Mar 8, 2024
4788ce7
Merge pull request #54 from Tenth-Team/optimization
ragimov700 Mar 8, 2024
8aed216
added content tests
qwertttyyy Mar 8, 2024
dc8d0e2
fix imports
qwertttyyy Mar 8, 2024
e2a08e9
Merge commit
antonata-c Mar 8, 2024
67b7204
fixes for lint
antonata-c Mar 8, 2024
ab32fbd
Add promocode tests
antonata-c Mar 8, 2024
a3cc81d
Merge pull request #58 from Tenth-Team/tests/promocode
ragimov700 Mar 9, 2024
b200f1a
Merge branch 'develop' into tests/content
ragimov700 Mar 9, 2024
dc57951
Merge pull request #55 from Tenth-Team/tests/content
ragimov700 Mar 9, 2024
6fb6d50
Merge pull request #51 from Tenth-Team/features/documentation
ragimov700 Mar 9, 2024
4f76e64
added promocode test data
ragimov700 Mar 9, 2024
29e335d
additional comments and blog urls
ragimov700 Mar 9, 2024
0598672
Merge pull request #59 from Tenth-Team/fixtures
ragimov700 Mar 9, 2024
25abc26
заявка для логистов download
VadimGurzhy Mar 9, 2024
d681369
fix
VadimGurzhy Mar 9, 2024
aef38e9
fix2
VadimGurzhy Mar 9, 2024
33317d4
fix4
VadimGurzhy Mar 9, 2024
6a9f42e
fix5
VadimGurzhy Mar 9, 2024
a68f5fe
fix6
VadimGurzhy Mar 9, 2024
9352587
Merge pull request #61 from Tenth-Team/download_form
ragimov700 Mar 9, 2024
6553eea
added methods for ambassadors
ragimov700 Mar 9, 2024
f5029fe
rework methods for loyalty page
qwertttyyy Mar 10, 2024
84f8797
schemas and edit ambassador serializer
ragimov700 Mar 10, 2024
7e63ac0
fix filters, and add tests
ragimov700 Mar 10, 2024
007f41e
fix flake8
ragimov700 Mar 10, 2024
f13d192
Merge pull request #64 from Tenth-Team/feature/loyalty_rework
ragimov700 Mar 10, 2024
9327c29
Merge pull request #66 from Tenth-Team/amb
ragimov700 Mar 10, 2024
27cba26
cd configured
ragimov700 Mar 10, 2024
fed20ad
Merge pull request #67 from Tenth-Team/cd
ragimov700 Mar 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ambassador viewset and serializer
ragimov700 committed Feb 24, 2024
commit 2a690b6500031536de0fb54fcf6a4efbe13ab6ad
55 changes: 55 additions & 0 deletions backend/ambassadors/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Generated by Django 4.2.10 on 2024-02-24 09:32

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
]

operations = [
migrations.CreateModel(
name='AmbassadorGoal',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255, verbose_name='Название цели')),
],
),
migrations.CreateModel(
name='TrainingProgram',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255, verbose_name='Название программы')),
],
),
migrations.CreateModel(
name='Ambassador',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('full_name', models.CharField(max_length=255, verbose_name='Полное имя')),
('gender', models.CharField(choices=[('М', 'Мужской'), ('Ж', 'Женский')], max_length=1, verbose_name='Пол')),
('country', models.CharField(max_length=100, verbose_name='Страна')),
('city', models.CharField(max_length=100, verbose_name='Город')),
('address', models.CharField(max_length=255, verbose_name='Адрес проживания')),
('postal_code', models.CharField(max_length=20, verbose_name='Индекс')),
('email', models.CharField(max_length=255, verbose_name='Адрес проживания')),
('phone_number', models.CharField(max_length=20, verbose_name='Номер телефона')),
('telegram', models.CharField(max_length=100, verbose_name='Ник в телеграме')),
('edu', models.TextField(max_length=1000, verbose_name='Образование')),
('work', models.TextField(max_length=1000, verbose_name='Место работы')),
('study_goal', models.TextField(max_length=1000, verbose_name='Цель обучения')),
('blog_url', models.CharField(blank=True, max_length=255, null=True, verbose_name='Ссылка на блоги')),
('clothing_size', models.CharField(choices=[('XS', 'XS'), ('S', 'S'), ('M', 'M'), ('L', 'L'), ('XL', 'XL')], max_length=3, verbose_name='Размер одежды')),
('shoe_size', models.CharField(max_length=50, verbose_name='Размер обуви')),
('additional_comments', models.TextField(blank=True, max_length=2000, null=True, verbose_name='Дополнительная информация')),
('status', models.CharField(choices=[('active', 'Активный'), ('paused', 'На паузе'), ('not_ambassador', 'Не амбассадор'), ('pending', 'Уточняется')], default='pending', max_length=50, verbose_name='Статус амбассадора')),
('reg_date', models.DateTimeField(auto_now_add=True, verbose_name='Дата регистрации')),
('amb_goal', models.ManyToManyField(related_name='ambassadors', to='ambassadors.ambassadorgoal', verbose_name='Цель амбассадорства')),
('ya_edu', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='ambassadors.trainingprogram', verbose_name='Программа обучения')),
],
),
]
9 changes: 9 additions & 0 deletions backend/api/v1/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from rest_framework import serializers

from ambassadors.models import Ambassador


class AmbassadorSerializer(serializers.ModelSerializer):
class Meta:
model = Ambassador
fields = '__all__'
5 changes: 5 additions & 0 deletions backend/api/v1/urls.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
from django.urls import path, include
from rest_framework.routers import DefaultRouter
from .views import AmbassadorViewSet
router = DefaultRouter()
router.register(r'ambassadors', AmbassadorViewSet)

urlpatterns = [
path('', include(router.urls)),
path('', include('djoser.urls')),
path('auth/', include('djoser.urls.authtoken')),
]
7 changes: 6 additions & 1 deletion backend/api/v1/views.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
from django.shortcuts import render
from rest_framework import viewsets
from ambassadors.models import Ambassador
from .serializers import AmbassadorSerializer

# Create your views here.
class AmbassadorViewSet(viewsets.ModelViewSet):
queryset = Ambassador.objects.all()
serializer_class = AmbassadorSerializer
19 changes: 19 additions & 0 deletions backend/users/migrations/0002_alter_user_phone_number.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 4.2.10 on 2024-02-24 09:32

import django.core.validators
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('users', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='user',
name='phone_number',
field=models.CharField(max_length=16, unique=True, validators=[django.core.validators.RegexValidator(message='Номер телефона необходимо вводить в формате: «+999999999». Допускается до 15 цифр.', regex='^\\+\\d{8,15}$')]),
),
]