From 6534b172e2abc679621c47a90f28c1bbfd1a5470 Mon Sep 17 00:00:00 2001 From: yoneyan Date: Mon, 9 Sep 2024 01:40:19 +0900 Subject: [PATCH] =?UTF-8?q?#43=20=E3=82=B0=E3=83=AB=E3=83=BC=E3=83=97?= =?UTF-8?q?=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E6=83=85=E5=A0=B1=E3=82=92?= =?UTF-8?q?=E3=83=88=E3=83=83=E3=83=97=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AB?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=AA=E3=81=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0005_alter_group_status.py | 18 ++++ custom_auth/models.py | 2 +- custom_auth/signals.py | 61 +++-------- custom_auth/tool.py | 42 ++++++++ dsbd/templates/home.html | 40 ++++--- dsbd/views.py | 3 + ticket/signals.py | 102 ++---------------- ticket/tool.py | 85 +++++++++++++++ 8 files changed, 194 insertions(+), 159 deletions(-) create mode 100644 custom_auth/migrations/0005_alter_group_status.py create mode 100644 ticket/tool.py diff --git a/custom_auth/migrations/0005_alter_group_status.py b/custom_auth/migrations/0005_alter_group_status.py new file mode 100644 index 0000000..e3ff3af --- /dev/null +++ b/custom_auth/migrations/0005_alter_group_status.py @@ -0,0 +1,18 @@ +# Generated by Django 5.1.1 on 2024-09-08 15:50 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('custom_auth', '0004_group_users_alter_user_groups'), + ] + + operations = [ + migrations.AlterField( + model_name='group', + name='status', + field=models.IntegerField(choices=[(1, '有効'), (10, 'ユーザより廃止'), (11, '運営委員より廃止'), (12, '審査落ち')], default=1, verbose_name='ステータス'), + ), + ] diff --git a/custom_auth/models.py b/custom_auth/models.py index e99803b..124bfbf 100644 --- a/custom_auth/models.py +++ b/custom_auth/models.py @@ -80,7 +80,7 @@ class Group(models.Model): # noqa: F811 name = models.CharField("name", max_length=150, unique=True) name_jp = models.CharField("name(japanese)", max_length=150, unique=True) comment = models.CharField("comment", max_length=250, default="", blank=True) - status = models.IntegerField("ステータス", default=0, choices=GROUP_STATUS_CHOICES) + status = models.IntegerField("ステータス", default=1, choices=GROUP_STATUS_CHOICES) allow_service_add = models.BooleanField("サービス追加許可", default=False) membership_type = models.IntegerField("会員種別", default=1, choices=MEMBERSHIP_TYPE_CHOICES) membership_expired_at = models.DateTimeField("有効期限", blank=True, null=True) diff --git a/custom_auth/signals.py b/custom_auth/signals.py index ebee9de..696fd53 100644 --- a/custom_auth/signals.py +++ b/custom_auth/signals.py @@ -1,7 +1,8 @@ from django.db.models.signals import post_save, pre_delete, pre_save from django.dispatch import receiver -from custom_auth.models import User +from custom_auth.models import Group, User +from custom_auth.tool import SignalTool from dsbd.notify import notify_db_save @@ -16,58 +17,26 @@ def user_model_pre_save(sender, instance, **kwargs): @receiver(post_save, sender=User) def post_user(sender, instance, created, **kwargs): if created: - text = get_create_user(True, instance) + text = SignalTool().get_create_user(True, instance) notify_db_save(table_name="User", type=0, data=text) else: - text = get_update_user(instance._pre_save_instance, instance) + text = SignalTool().get_update_user(instance._pre_save_instance, instance) notify_db_save(table_name="User", type=1, data=text) @receiver(pre_delete, sender=User) def delete_user(sender, instance, **kwargs): - text = get_create_user(False, instance) + text = SignalTool().get_create_user(False, instance) notify_db_save(table_name="User", type=2, data=text) -def get_create_user(short, instance): - text = "--%d[%s]--\n" % ( - instance.id, - instance.username, - ) - return text if not short else text + "有効: %r\nE-Mail: %s\n" % (instance.is_active, instance.email) - - -def get_update_user(before, after): - text = "%s----更新状況----\n" % (get_create_user(True, before),) - if before.username != after.username: - text += "username: %s => %s\n" % (before.username, after.username) - if before.username_jp != after.username_jp: - text += "username(jp): %s => %s\n" % (before.username, after.username) - if before.email != after.email: - text += "E-Mail: %s => %s\n" % (before.email, after.email) - if before.is_active != after.is_active: - text += "有効: %r => %r\n" % (before.is_active, after.is_active) - text += "------------\n" - return text - - -def get_create_signup_key(short, instance): - text = "--%d[%s]--\n" % ( - instance.id, - instance.key, - ) - return text if not short else text + "利用済み: %r\n有効期限: %s\n" % (instance.is_used, instance.expired_at) - - -def get_update_signup_key(before, after): - text = "%s----更新状況----\n" % (get_create_signup_key(True, before),) - if before.key != after.key: - text += "key: %s => %s\n" % (before.key, after.key) - if before.is_used != after.is_used: - text += "使用済み: %r => %r\n" % (before.is_used, after.is_used) - if before.expired_at != after.expired_at: - text += "有効期限: %s => %s\n" % (before.expired_at, after.expired_at) - if before.comment != after.comment: - text += "comment: %r => %r\n" % (before.comment, after.comment) - text += "------------\n" - return text +@receiver(post_save, sender=Group) +def update_group(sender, instance, created, **kwargs): + # 審査OKステータス変更時にサービス追加許可にする + if instance.is_pass and not instance.allow_service_add: + instance.allow_service_add = True + instance.save(update_fields=["allow_service_add"]) + # 審査NGステータス変更時にサービス追加拒否設定にする + if not instance.is_pass and instance.allow_service_add: + instance.allow_service_add = False + instance.save(update_fields=["allow_service_add"]) diff --git a/custom_auth/tool.py b/custom_auth/tool.py index 0b85aeb..5a489a8 100644 --- a/custom_auth/tool.py +++ b/custom_auth/tool.py @@ -5,3 +5,45 @@ def random_string(num): random_list = [random.choice(string.ascii_letters + string.digits) for i in range(num)] return "".join(random_list) + + +class SignalTool: + def get_create_user(self, short, instance): + text = "--%d[%s]--\n" % ( + instance.id, + instance.username, + ) + return text if not short else text + "有効: %r\nE-Mail: %s\n" % (instance.is_active, instance.email) + + def get_update_user(self, before, after): + text = "%s----更新状況----\n" % (self.get_create_user(True, before),) + if before.username != after.username: + text += "username: %s => %s\n" % (before.username, after.username) + if before.username_jp != after.username_jp: + text += "username(jp): %s => %s\n" % (before.username, after.username) + if before.email != after.email: + text += "E-Mail: %s => %s\n" % (before.email, after.email) + if before.is_active != after.is_active: + text += "有効: %r => %r\n" % (before.is_active, after.is_active) + text += "------------\n" + return text + + def get_create_signup_key(self, short, instance): + text = "--%d[%s]--\n" % ( + instance.id, + instance.key, + ) + return text if not short else text + "利用済み: %r\n有効期限: %s\n" % (instance.is_used, instance.expired_at) + + def get_update_signup_key(self, before, after): + text = "%s----更新状況----\n" % (self.get_create_signup_key(True, before),) + if before.key != after.key: + text += "key: %s => %s\n" % (before.key, after.key) + if before.is_used != after.is_used: + text += "使用済み: %r => %r\n" % (before.is_used, after.is_used) + if before.expired_at != after.expired_at: + text += "有効期限: %s => %s\n" % (before.expired_at, after.expired_at) + if before.comment != after.comment: + text += "comment: %r => %r\n" % (before.comment, after.comment) + text += "------------\n" + return text diff --git a/dsbd/templates/home.html b/dsbd/templates/home.html index 49a4c1c..7d74a11 100644 --- a/dsbd/templates/home.html +++ b/dsbd/templates/home.html @@ -17,24 +17,32 @@

お知らせ

-
-
-
Warning card title
-

Some quick example text to build on - the card title and make up the - bulk of the card's content.

+ {% if request.user.groups.count == 0 %} +
+
+
グループの新規申請手続き
+

グループの新規申請手続きを行ってください

+ 申請はこちらから +
-
+ {% endif %} + {% if is_new_group_request %} +
+
+
グループの申請処理中
+

現在、グループの申請処理中です。
この作業には時間が掛かる可能性があります。

+
+
+ {% endif %} {% for notice in notices %}
- {{ notice.start_at }}~ - {% if notice.end_at != None %} - {{ notice.end_at }}{% else %} - 無期限{% endif %} - + {{ notice.start_at }} ~ + {% if notice.end_at != None %}{{ notice.end_at }}{% else %} + 無期限{% endif %} + {% if notice.is_info %} 情報 {% endif %} @@ -60,10 +68,8 @@
{{ notice.title }}

{{ notice.title }}

- +
{{ notice.body | linebreaksbr }} diff --git a/dsbd/views.py b/dsbd/views.py index 200aa91..a394bc9 100644 --- a/dsbd/views.py +++ b/dsbd/views.py @@ -147,6 +147,8 @@ def activate_user(request, activate_token): @login_required def index(request): + # 申請中のグループが存在するかしないか識別 + is_new_group_request = request.user.groups.filter(is_pass=False, status=1).exists() notice_objects = Notice.objects.get_notice() # ticket_objects = Ticket.objects.get_ticket(user=request.user).filter(is_solved=False) @@ -204,6 +206,7 @@ def index(request): "notices": notices, # "tickets": tickets, "services": services, + "is_new_group_request": is_new_group_request, } return render(request, "home.html", context) diff --git a/ticket/signals.py b/ticket/signals.py index ef9c879..e303a62 100644 --- a/ticket/signals.py +++ b/ticket/signals.py @@ -3,6 +3,7 @@ from dsbd.notify import notify_db_save from ticket.models import Chat, Ticket +from ticket.tool import SignalTool @receiver(pre_save, sender=Ticket) @@ -16,75 +17,19 @@ def ticket_model_pre_save(sender, instance, **kwargs): @receiver(post_save, sender=Ticket) def post_ticket(sender, instance, created, **kwargs): if created: - text = get_create_ticket(True, instance) + text = SignalTool().get_create_ticket(True, instance) notify_db_save(table_name="Ticket", type=0, data=text) else: - text = get_update_ticket(instance._pre_save_instance, instance) + text = SignalTool().get_update_ticket(instance._pre_save_instance, instance) notify_db_save(table_name="Ticket", type=1, data=text) @receiver(pre_delete, sender=Ticket) def delete_ticket(sender, instance, **kwargs): - text = get_create_ticket(False, instance) + text = SignalTool().get_create_ticket(False, instance) notify_db_save(table_name="Ticket", type=2, data=text) -def get_create_ticket(short, instance): - text = "--%d[%s]--\nUser: %s| Group: %s\n" % (instance.id, instance.title, instance.user, instance.group) - return ( - text - if not short - else text - + "title: %s\nbody: %s\n解決済み: %s\n承認済み: %s\n拒否済み: %s\n運営委員から起票: %s\n" - % ( - instance.title, - instance.body, - solved_to_str(instance.is_solved), - approve_to_str(instance.is_approve), - reject_to_str(instance.is_reject), - from_admin_to_str(instance.from_admin), - ) - ) - - -def get_update_ticket(before, after): - text = "%s----更新状況----\n" % (get_create_ticket(True, before),) - if before.user != after.user: - text += "user: %s => %s\n" % (before.user, after.user) - if before.group != after.group: - text += "group: %s => %s\n" % (before.group, after.group) - if before.title != after.title: - text += "title: %s => %s\n" % (before.title, after.title) - if before.body != after.body: - text += "body: %s => %s\n" % (before.body, after.body) - if before.is_solved != after.is_solved: - text += "解決済み: %s => %s\n" % (solved_to_str(before.is_solved), solved_to_str(after.is_solved)) - if before.is_approve != after.is_approve: - text += "承認済み: %s => %s\n" % (approve_to_str(before.is_approve), approve_to_str(after.is_approve)) - if before.is_reject != after.is_reject: - text += "拒否済み: %s => %s\n" % (reject_to_str(before.is_reject), reject_to_str(after.is_reject)) - if before.from_admin != after.from_admin: - text += "運営委員から起票: %s => %s\n" % (from_admin_to_str(before.from_admin), reject_to_str(after.from_admin)) - text += "------------\n" - return text - - -def solved_to_str(is_solved): - return "解決済み" if is_solved else "未解決" - - -def approve_to_str(is_approve): - return "承認" if is_approve else "未承認" - - -def reject_to_str(is_reject): - return "拒否済み" if is_reject else "not 拒否" - - -def from_admin_to_str(from_admin): - return "運営委員から起票" if from_admin else "not 運営委員から起票" - - @receiver(pre_save, sender=Chat) def chat_model_pre_save(sender, instance, **kwargs): try: @@ -96,47 +41,14 @@ def chat_model_pre_save(sender, instance, **kwargs): @receiver(post_save, sender=Chat) def post_chat(sender, instance, created, **kwargs): if created: - text = get_create_chat(True, instance) + text = SignalTool().get_create_chat(True, instance) notify_db_save(table_name="Chat", type=0, data=text) else: - text = get_update_chat(instance._pre_save_instance, instance) + text = SignalTool().get_update_chat(instance._pre_save_instance, instance) notify_db_save(table_name="Chat", type=1, data=text) @receiver(pre_delete, sender=Chat) def delete_chat(sender, instance, **kwargs): - text = get_create_chat(False, instance) + text = SignalTool().get_create_chat(False, instance) notify_db_save(table_name="Chat", type=2, data=text) - - -def get_create_chat(short, instance): - text = "--%d--\n[%s] User: %s| Group: %s\nTicket: %s\n" % ( - instance.id, - "ユーザ投稿" if instance.is_admin else "管理者投稿", - instance.user, - instance.group, - instance.ticket, - ) - return text if not short else text + "body: %s\n" % (instance.body,) - - -def get_update_chat(before, after): - text = "%s----更新状況----\n" % (get_create_chat(True, before),) - if before.user != after.user: - text += "user: %s => %s\n" % (before.user, after.user) - if before.group != after.group: - text += "group: %s => %s\n" % (before.group, after.group) - if before.body != after.body: - text += "body: %s => %s\n" % (before.body, after.body) - if before.is_admin != after.is_admin: - text += "運営委員回答: %s => %s\n" % (admin_to_str(before.is_admin), admin_to_str(after.is_admin)) - text += "------------\n" - return text - - -def admin_to_str(is_admin): - return "運営委員回答" if is_admin else "not 運営委員回答" - - -def active_to_str(is_admin): - return "有効" if is_admin else "無効" diff --git a/ticket/tool.py b/ticket/tool.py new file mode 100644 index 0000000..c0597f5 --- /dev/null +++ b/ticket/tool.py @@ -0,0 +1,85 @@ +class SignalTool: + def get_create_ticket(self, short, instance): + text = "--%d[%s]--\nUser: %s| Group: %s\n" % (instance.id, instance.title, instance.user, instance.group) + return ( + text + if not short + else text + + "title: %s\nbody: %s\n解決済み: %s\n承認済み: %s\n拒否済み: %s\n運営委員から起票: %s\n" + % ( + instance.title, + instance.body, + self.solved_to_str(instance.is_solved), + self.approve_to_str(instance.is_approve), + self.reject_to_str(instance.is_reject), + self.from_admin_to_str(instance.from_admin), + ) + ) + + def get_update_ticket(self, before, after): + text = "%s----更新状況----\n" % (self.get_create_ticket(True, before),) + if before.user != after.user: + text += "user: %s => %s\n" % (before.user, after.user) + if before.group != after.group: + text += "group: %s => %s\n" % (before.group, after.group) + if before.title != after.title: + text += "title: %s => %s\n" % (before.title, after.title) + if before.body != after.body: + text += "body: %s => %s\n" % (before.body, after.body) + if before.is_solved != after.is_solved: + text += "解決済み: %s => %s\n" % (self.solved_to_str(before.is_solved), self.solved_to_str(after.is_solved)) + if before.is_approve != after.is_approve: + text += "承認済み: %s => %s\n" % ( + self.approve_to_str(before.is_approve), + self.approve_to_str(after.is_approve), + ) + if before.is_reject != after.is_reject: + text += "拒否済み: %s => %s\n" % (self.reject_to_str(before.is_reject), self.reject_to_str(after.is_reject)) + if before.from_admin != after.from_admin: + text += "運営委員から起票: %s => %s\n" % ( + self.from_admin_to_str(before.from_admin), + self.reject_to_str(after.from_admin), + ) + text += "------------\n" + return text + + def solved_to_str(self, is_solved): + return "解決済み" if is_solved else "未解決" + + def approve_to_str(self, is_approve): + return "承認" if is_approve else "未承認" + + def reject_to_str(self, is_reject): + return "拒否済み" if is_reject else "not 拒否" + + def from_admin_to_str(self, from_admin): + return "運営委員から起票" if from_admin else "not 運営委員から起票" + + def get_create_chat(self, short, instance): + text = "--%d--\n[%s] User: %s| Group: %s\nTicket: %s\n" % ( + instance.id, + "ユーザ投稿" if instance.is_admin else "管理者投稿", + instance.user, + instance.group, + instance.ticket, + ) + return text if not short else text + "body: %s\n" % (instance.body,) + + def get_update_chat(self, before, after): + text = "%s----更新状況----\n" % (self.get_create_chat(True, before),) + if before.user != after.user: + text += "user: %s => %s\n" % (before.user, after.user) + if before.group != after.group: + text += "group: %s => %s\n" % (before.group, after.group) + if before.body != after.body: + text += "body: %s => %s\n" % (before.body, after.body) + if before.is_admin != after.is_admin: + text += "運営委員回答: %s => %s\n" % (self.admin_to_str(before.is_admin), self.admin_to_str(after.is_admin)) + text += "------------\n" + return text + + def admin_to_str(self, is_admin): + return "運営委員回答" if is_admin else "not 運営委員回答" + + def active_to_str(self, is_admin): + return "有効" if is_admin else "無効"