revert migration files

.dockerignore

@@ -53,3 +53,4 @@ hosts
 *.retry
 #Vagrantfiles, since we are using docker
 Vagrantfile.*
+media/

.gitignore

@@ -165,3 +165,4 @@ cython_debug/
 #.idea/
 
 # End of https://www.toptal.com/developers/gitignore/api/django
+.DS_Store

docker-compose.yaml

@@ -1,46 +1,46 @@
 version: "3.9"
 
 services:
-   postgres-db:
+  # postgres-db:
-      image: kartoza/postgis:12.0
+  #    image: kartoza/postgis:12.0
-      ports:
+  #    ports:
-         - 5432:5432
+  #       - 5432:5432
-      volumes:
+  #    volumes:
-         - postgres_data:/var/lib/postgresql
+  #       - postgres_data:/var/lib/postgresql
-         - ./custom-postgresql.conf:/etc/postgresql/12/main/postgresql.conf
+  #       - ./custom-postgresql.conf:/etc/postgresql/12/main/postgresql.conf
-      environment:
+  #    environment:
-         - POSTGRES_USER=${POSTGRES_USER}
+  #       - POSTGRES_USER=${POSTGRES_USER}
-         - POSTGRES_PASS=${POSTGRES_PASS}
+  #       - POSTGRES_PASS=${POSTGRES_PASS}
-         - POSTGRES_DBNAME=${POSTGRES_DBNAME}
+  #       - POSTGRES_DBNAME=${POSTGRES_DBNAME}
-         - POSTGRES_MAX_CONNECTIONS=600
+  #       - POSTGRES_MAX_CONNECTIONS=600
 
-      restart: "on-failure"
+  #    restart: "on-failure"
-      networks:
+  #    networks:
-         - rog-api
+  #       - rog-api
 
-   api:
+  api:
-      build:
+    build:
-         context: .
+      context: .
-         dockerfile: Dockerfile.gdal
+      dockerfile: Dockerfile.gdal
-      command: python3 manage.py runserver 0.0.0.0:8100
+    command: python3 manage.py runserver 0.0.0.0:8100
-      volumes:
+    volumes:
-         - .:/app
+      - .:/app
-      ports:
+    ports:
-        - 8100:8100
+      - 8100:8100
-      env_file:
+    env_file:
-         - .env
+      - .env
-      restart: "on-failure"
+    restart: "on-failure"
-      depends_on:
+    #  depends_on:
-         - postgres-db
+    #    - postgres-db
-      networks:
+    networks:
-         - rog-api
+      - rog-api
-      #entrypoint: ["/app/wait-for.sh", "postgres-db:5432", "--", ""]
+    #entrypoint: ["/app/wait-for.sh", "postgres-db:5432", "--", ""]
-      #command: python3 manage.py runserver 0.0.0.0:8100
+    #command: python3 manage.py runserver 0.0.0.0:8100
 
 networks:
-   rog-api:
+  rog-api:
-      driver: bridge
+    driver: bridge
 
 volumes:
-   postgres_data:
+  postgres_data:
-   geoserver-data:
+  geoserver-data:

rog/backend.py

@@ -2,6 +2,7 @@ from django.conf import settings
 #from django.contrib.auth import get_user_model
 from .models import CustomUser
 from django.contrib.auth.backends import ModelBackend
+from django.contrib.auth import get_user_model
 
 class EmailOrUsernameModelBackend(ModelBackend):
     """

rog/management/commands/cleanup_temp_users.py

@@ -0,0 +1,16 @@
+from django.core.management.base import BaseCommand
+from django.utils import timezone
+from rog.models import TempUser  # アプリ名 'rog' を適切に変更してください
+
+class Command(BaseCommand):
+    help = 'Deletes expired temporary user records'
+
+    def handle(self, *args, **options):
+        expired_users = TempUser.objects.filter(expires_at__lt=timezone.now())
+        count = expired_users.count()
+        expired_users.delete()
+        self.stdout.write(self.style.SUCCESS(f'Successfully deleted {count} expired temporary user records'))
+
+
+# cron job の設定
+# 0 3 * * * /path/to/your/python /path/to/your/manage.py cleanup_temp_users

rog/migrations/0001_initial.py

@@ -1,351 +0,0 @@
-# Generated by Django 3.2.9 on 2022-05-04 15:05
-
-from django.conf import settings
-import django.contrib.gis.db.models.fields
-from django.db import migrations, models
-import django.db.models.deletion
-import rog.models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('auth', '0012_alter_user_first_name_max_length'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='JpnAdminMainPerf',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(blank=True, null=True, srid=4326)),
-                ('adm0_en', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm0_ja', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm0_pcode', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm1_en', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm1_ja', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm1_pcode', models.CharField(blank=True, max_length=254, null=True)),
-            ],
-            options={
-                'db_table': 'jpn_admin_main_perf',
-                'managed': False,
-            },
-        ),
-        migrations.CreateModel(
-            name='JpnAdminPerf',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('geom', django.contrib.gis.db.models.fields.MultiLineStringField(blank=True, null=True, srid=4326)),
-                ('et_id', models.IntegerField(blank=True, null=True)),
-                ('et_right', models.CharField(blank=True, max_length=80, null=True)),
-                ('et_left', models.CharField(blank=True, max_length=80, null=True)),
-                ('adm2_l', models.CharField(blank=True, max_length=50, null=True)),
-                ('adm1_l', models.CharField(blank=True, max_length=50, null=True)),
-                ('adm0_l', models.CharField(blank=True, max_length=50, null=True)),
-                ('adm0_r', models.CharField(blank=True, max_length=50, null=True)),
-                ('adm1_r', models.CharField(blank=True, max_length=50, null=True)),
-                ('adm2_r', models.CharField(blank=True, max_length=50, null=True)),
-                ('admlevel', models.IntegerField(blank=True, null=True)),
-            ],
-            options={
-                'db_table': 'jpn_admin_perf',
-                'managed': False,
-            },
-        ),
-        migrations.CreateModel(
-            name='JpnSubPerf',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(blank=True, null=True, srid=4326)),
-                ('adm0_en', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm0_ja', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm0_pcode', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm1_en', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm1_ja', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm1_pcode', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm2_ja', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm2_en', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm2_pcode', models.CharField(blank=True, max_length=254, null=True)),
-            ],
-            options={
-                'db_table': 'jpn_sub_perf',
-                'managed': False,
-            },
-        ),
-        migrations.CreateModel(
-            name='CustomUser',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
-                ('email', models.EmailField(max_length=254, unique=True, verbose_name='email address')),
-                ('is_staff', models.BooleanField(default=False)),
-                ('is_active', models.BooleanField(default=False)),
-                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
-                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
-            ],
-            options={
-                'abstract': False,
-            },
-        ),
-        migrations.CreateModel(
-            name='Location',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('location_id', models.IntegerField(blank=True, null=True, verbose_name='Location id')),
-                ('location_name', models.CharField(default='--- 場所をお願いします --', max_length=255, verbose_name='Location Name')),
-                ('category', models.CharField(blank=True, max_length=255, null=True, verbose_name='Category')),
-                ('zip', models.CharField(blank=True, max_length=12, null=True, verbose_name='Zip code')),
-                ('address', models.CharField(blank=True, max_length=512, null=True, verbose_name='Address')),
-                ('prefecture', models.CharField(blank=True, max_length=255, null=True, verbose_name='Prefecture')),
-                ('area', models.CharField(blank=True, max_length=255, null=True, verbose_name='Area')),
-                ('city', models.CharField(blank=True, max_length=255, null=True, verbose_name='City')),
-                ('latitude', models.FloatField(blank=True, null=True, verbose_name='Latitude')),
-                ('longitude', models.FloatField(blank=True, null=True, verbose_name='Latitude')),
-                ('photos', models.CharField(blank=True, max_length=255, null=True, verbose_name='Phptos')),
-                ('videos', models.CharField(blank=True, max_length=255, null=True, verbose_name='Videos')),
-                ('webcontents', models.CharField(blank=True, max_length=255, null=True, verbose_name='Web Content')),
-                ('status', models.CharField(blank=True, max_length=255, null=True, verbose_name='Status')),
-                ('portal', models.CharField(blank=True, max_length=255, null=True, verbose_name='Portal')),
-                ('group', models.CharField(blank=True, max_length=255, null=True, verbose_name='Group')),
-                ('phone', models.CharField(blank=True, max_length=255, null=True, verbose_name='Phone')),
-                ('fax', models.CharField(blank=True, max_length=255, null=True, verbose_name='Fax')),
-                ('email', models.EmailField(blank=True, max_length=255, null=True, verbose_name='Email')),
-                ('facility', models.CharField(blank=True, max_length=255, null=True, verbose_name='Facility')),
-                ('remark', models.CharField(blank=True, max_length=255, null=True, verbose_name='Remarks')),
-                ('tags', models.CharField(blank=True, max_length=512, null=True, verbose_name='Tags')),
-                ('parammeters', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('last_updated_at', models.DateTimeField(auto_now=True)),
-                ('geom', django.contrib.gis.db.models.fields.MultiPointField(srid=4326)),
-                ('last_updated_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='location_updated_user', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='ShapeLayers',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255, verbose_name='Shape Layer')),
-                ('file', models.FileField(blank=True, upload_to=rog.models.get_file_path)),
-                ('uploaded_date', models.DateField(auto_now_add=True)),
-                ('layerof', models.IntegerField(choices=[(1, 'location'), (2, 'Location_line'), (3, 'Location_polygon')], default=1)),
-                ('table_name', models.CharField(blank=True, max_length=255, verbose_name='Table name')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='TestModel',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('testbane', models.CharField(max_length=355, verbose_name='test field')),
-                ('wanttogo', models.BooleanField(default=False)),
-                ('like', models.BooleanField(default=False)),
-                ('checkin', models.BooleanField(default=False)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('last_updated_at', models.DateTimeField(auto_now=True)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='TravelList',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('travel_id', models.IntegerField(verbose_name='Travel Id')),
-                ('start_date', models.DateTimeField(blank=True, null=True, verbose_name='Start date')),
-                ('finish_date', models.DateTimeField(blank=True, null=True, verbose_name='End date')),
-                ('category', models.CharField(choices=[('PRIVATE', 'Private'), ('GROUP', 'Group'), ('AGENT', 'Agent'), ('ROGAINING', 'Rogaining')], max_length=256)),
-                ('title', models.CharField(max_length=255, verbose_name='Title')),
-                ('transportation', models.CharField(blank=True, max_length=255, null=True, verbose_name='Transpotation')),
-                ('moving_distance', models.IntegerField(blank=True, null=True)),
-                ('duration', models.DurationField(blank=True, null=True, verbose_name='Duration')),
-                ('eta', models.DateTimeField(blank=True, null=True)),
-                ('parammeters', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('last_updated_at', models.DateTimeField(auto_now=True)),
-                ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='travel_list_updated_user', to=settings.AUTH_USER_MODEL)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Useractions',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('wanttogo', models.BooleanField(default=False)),
-                ('like', models.BooleanField(default=False)),
-                ('checkin', models.BooleanField(default=False)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('last_updated_at', models.DateTimeField(auto_now=True)),
-                ('location', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='action_location', to='rog.location')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='action_user', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='TravelPoint',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('distance', models.FloatField(blank=True, null=True)),
-                ('transportation', models.CharField(blank=True, max_length=255, null=True, verbose_name='Transpotation')),
-                ('eta', models.DateTimeField(blank=True, null=True)),
-                ('order_number', models.IntegerField(blank=True, null=True)),
-                ('parammeters', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('last_updated_at', models.DateTimeField(auto_now=True)),
-                ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='travelpoint_updated_user', to=settings.AUTH_USER_MODEL)),
-                ('location', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='rog.location')),
-                ('travel_list', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='rog.travellist')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='SystemSettings',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('setting_name', models.CharField(max_length=255, verbose_name='Settings Name')),
-                ('version', models.CharField(blank=True, max_length=10, null=True, verbose_name='Version')),
-                ('effective_date', models.DateTimeField()),
-                ('end_date', models.DateTimeField()),
-                ('parammeters', models.CharField(max_length=512, verbose_name='Parameters')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('last_updated_at', models.DateTimeField(auto_now=True)),
-                ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='system_setting_updated_user', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='RogUser',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('email', models.EmailField(max_length=254, verbose_name='Email')),
-                ('phone', models.CharField(max_length=55, verbose_name='Phone Number')),
-                ('first_name', models.CharField(max_length=255, verbose_name='First Name')),
-                ('middle_name', models.CharField(blank=True, max_length=255, null=True, verbose_name='Middle Name')),
-                ('last_name', models.CharField(max_length=255, verbose_name='last_name')),
-                ('nickname', models.CharField(blank=True, max_length=255, null=True, verbose_name='Nickname')),
-                ('country', models.CharField(default='Japan', max_length=255, verbose_name='Country')),
-                ('language', models.CharField(default='Japanese', max_length=255, verbose_name='Language')),
-                ('prefecture', models.CharField(blank=True, max_length=255, null=True, verbose_name='Prefecture')),
-                ('sex', models.CharField(blank=True, default='unknown', max_length=255, null=True, verbose_name='Sex')),
-                ('birthyear', models.IntegerField(blank=True, null=True, verbose_name='Birth year')),
-                ('family_structure', models.IntegerField(blank=True, null=True, verbose_name='Family Structure')),
-                ('level', models.IntegerField(blank=True, default=0, null=True, verbose_name='Level')),
-                ('parammeters', models.CharField(max_length=512, verbose_name='Parameters')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('last_updated_at', models.DateTimeField(auto_now=True)),
-                ('introducer', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='introduced_uesr', to=settings.AUTH_USER_MODEL)),
-                ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='roguser_updated_user', to=settings.AUTH_USER_MODEL)),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Location_polygon',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('location_id', models.IntegerField(blank=True, null=True, verbose_name='Location id')),
-                ('location_name', models.CharField(max_length=255, verbose_name='Location Name')),
-                ('category', models.CharField(blank=True, max_length=255, null=True, verbose_name='Category')),
-                ('zip', models.CharField(blank=True, max_length=12, null=True, verbose_name='Zip code')),
-                ('address', models.CharField(blank=True, max_length=512, null=True, verbose_name='Address')),
-                ('prefecture', models.CharField(blank=True, max_length=255, null=True, verbose_name='Prefecture')),
-                ('area', models.CharField(blank=True, max_length=255, null=True, verbose_name='Area')),
-                ('city', models.CharField(blank=True, max_length=255, null=True, verbose_name='City')),
-                ('photos', models.CharField(blank=True, max_length=255, null=True, verbose_name='Phptos')),
-                ('videos', models.CharField(blank=True, max_length=255, null=True, verbose_name='Videos')),
-                ('webcontents', models.CharField(blank=True, max_length=255, null=True, verbose_name='Web Content')),
-                ('status', models.CharField(blank=True, max_length=255, null=True, verbose_name='Status')),
-                ('portal', models.CharField(blank=True, max_length=255, null=True, verbose_name='Portal')),
-                ('group', models.CharField(blank=True, max_length=255, null=True, verbose_name='Group')),
-                ('phone', models.CharField(blank=True, max_length=255, null=True, verbose_name='Phone')),
-                ('fax', models.CharField(blank=True, max_length=255, null=True, verbose_name='Fax')),
-                ('email', models.EmailField(blank=True, max_length=255, null=True, verbose_name='Email')),
-                ('facility', models.CharField(blank=True, max_length=255, null=True, verbose_name='Facility')),
-                ('remark', models.CharField(blank=True, max_length=255, null=True, verbose_name='Remarks')),
-                ('tags', models.CharField(blank=True, max_length=512, null=True, verbose_name='Tags')),
-                ('parammeters', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('last_updated_at', models.DateTimeField(auto_now=True)),
-                ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(blank=True, null=True, srid=4326)),
-                ('last_updated_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='location_polygon_updated_user', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Location_line',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('location_id', models.IntegerField(blank=True, null=True, verbose_name='Location id')),
-                ('location_name', models.CharField(max_length=255, verbose_name='Location Name')),
-                ('category', models.CharField(blank=True, max_length=255, null=True, verbose_name='Category')),
-                ('zip', models.CharField(blank=True, max_length=12, null=True, verbose_name='Zip code')),
-                ('address', models.CharField(blank=True, max_length=512, null=True, verbose_name='Address')),
-                ('prefecture', models.CharField(blank=True, max_length=255, null=True, verbose_name='Prefecture')),
-                ('area', models.CharField(blank=True, max_length=255, null=True, verbose_name='Area')),
-                ('city', models.CharField(blank=True, max_length=255, null=True, verbose_name='City')),
-                ('photos', models.CharField(blank=True, max_length=255, null=True, verbose_name='Phptos')),
-                ('videos', models.CharField(blank=True, max_length=255, null=True, verbose_name='Videos')),
-                ('webcontents', models.CharField(blank=True, max_length=255, null=True, verbose_name='Web Content')),
-                ('status', models.CharField(blank=True, max_length=255, null=True, verbose_name='Status')),
-                ('portal', models.CharField(blank=True, max_length=255, null=True, verbose_name='Portal')),
-                ('group', models.CharField(blank=True, max_length=255, null=True, verbose_name='Group')),
-                ('phone', models.CharField(blank=True, max_length=255, null=True, verbose_name='Phone')),
-                ('fax', models.CharField(blank=True, max_length=255, null=True, verbose_name='Fax')),
-                ('email', models.EmailField(blank=True, max_length=255, null=True, verbose_name='Email')),
-                ('facility', models.CharField(blank=True, max_length=255, null=True, verbose_name='Facility')),
-                ('remark', models.CharField(blank=True, max_length=255, null=True, verbose_name='Remarks')),
-                ('tags', models.CharField(blank=True, max_length=512, null=True, verbose_name='Tags')),
-                ('parammeters', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('last_updated_at', models.DateTimeField(auto_now=True)),
-                ('geom', django.contrib.gis.db.models.fields.MultiLineStringField(blank=True, null=True, srid=4326)),
-                ('last_updated_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='location_line_updated_user', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='JoinedEvent',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('tagname', models.CharField(blank=True, max_length=255, null=True, verbose_name='Tag Name')),
-                ('status', models.CharField(choices=[('REGISTERED', 'Registered'), ('ACCEPTED', 'accepted'), ('PAID', 'paid'), ('JOINED', 'joined'), ('CANCELED', 'Canceled')], max_length=256)),
-                ('registrationid', models.CharField(max_length=56, verbose_name='Registration Id')),
-                ('payment_code', models.CharField(max_length=255, verbose_name='Payment Code')),
-                ('paid', models.IntegerField(default=0, verbose_name='Paid Amount')),
-                ('remark', models.CharField(blank=True, max_length=255, null=True, verbose_name='Remark')),
-                ('parammeters', models.CharField(max_length=512, verbose_name='Parameters')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('last_updated_at', models.DateTimeField(auto_now=True)),
-                ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='joined_event_updated_user', to=settings.AUTH_USER_MODEL)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Favorite',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('good', models.IntegerField(default=0, verbose_name='Good')),
-                ('favorite', models.IntegerField(default=0, verbose_name='Favorite')),
-                ('evaluation', models.IntegerField(default=0, verbose_name='Evaluation')),
-                ('number_visit', models.IntegerField(default=0, verbose_name='Good')),
-                ('last_visited', models.DateTimeField(blank=True, null=True, verbose_name='Last Visited')),
-                ('parammeters', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('last_updated_at', models.DateTimeField(auto_now=True)),
-                ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='favorite_updated_user', to=settings.AUTH_USER_MODEL)),
-                ('location', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='rog.location')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Event',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('tagname', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')),
-                ('status', models.CharField(choices=[('PREPARING', 'Preparing'), ('PROMOTION', 'Promotion'), ('EVENT', 'Event'), ('END', 'End')], max_length=256)),
-                ('price', models.IntegerField(default=0, verbose_name='Paid Amount')),
-                ('promotion_date', models.DateTimeField(blank=True, null=True, verbose_name='Promotion date')),
-                ('event_start', models.DateTimeField(blank=True, null=True, verbose_name='Promotion date')),
-                ('event_end', models.DateTimeField(blank=True, null=True, verbose_name='Promotion date')),
-                ('remark', models.CharField(blank=True, max_length=256, null=True)),
-                ('parammeters', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('last_updated_at', models.DateTimeField(auto_now=True)),
-                ('last_updated_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='event_updated_user', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]

rog/migrations/0002_auto_20220511_2017.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.2.9 on 2022-05-11 11:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='useractions',
-            name='order',
-            field=models.IntegerField(default=-1),
-        ),
-        migrations.AlterField(
-            model_name='customuser',
-            name='is_active',
-            field=models.BooleanField(default=True),
-        ),
-    ]

rog/migrations/0003_alter_useractions_order.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-05-11 17:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0002_auto_20220511_2017'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='useractions',
-            name='order',
-            field=models.IntegerField(default=0),
-        ),
-    ]

rog/migrations/0004_auto_20220606_0023.py

@@ -1,55 +0,0 @@
-# Generated by Django 3.2.9 on 2022-06-05 15:23
-
-import django.contrib.gis.db.models.fields
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0003_alter_useractions_order'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='GifuAreas',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(blank=True, null=True, srid=4326)),
-                ('adm0_en', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm0_ja', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm0_pcode', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm1_en', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm1_ja', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm1_pcode', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm2_ja', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm2_en', models.CharField(blank=True, max_length=254, null=True)),
-                ('adm2_pcode', models.CharField(blank=True, max_length=254, null=True)),
-                ('area_nm', models.CharField(blank=True, max_length=254, null=True)),
-            ],
-            options={
-                'db_table': 'gifu_areas',
-                'managed': False,
-            },
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='auto_checkin',
-            field=models.BooleanField(default=False, verbose_name='Is Autologin'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='checkin_radious',
-            field=models.IntegerField(blank=True, null=True, verbose_name='Checkin Radious'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='event_active',
-            field=models.BooleanField(default=True, verbose_name='Is Autologin'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='event_name',
-            field=models.CharField(blank=True, max_length=512, null=True, verbose_name='Tags'),
-        ),
-    ]

rog/migrations/0005_auto_20220606_1523.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.2.9 on 2022-06-06 06:23
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0004_auto_20220606_0023'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='location',
-            name='event_active',
-            field=models.BooleanField(default=True, verbose_name='Is Event active'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='event_name',
-            field=models.CharField(blank=True, max_length=512, null=True, verbose_name='Event name'),
-        ),
-    ]

rog/migrations/0006_location_paid.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-06-07 13:00
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0005_auto_20220606_1523'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='location',
-            name='paid',
-            field=models.BooleanField(default=False, verbose_name='Is Paid'),
-        ),
-    ]

rog/migrations/0007_auto_20220607_2207.py

@@ -1,22 +0,0 @@
-# Generated by Django 3.2.9 on 2022-06-07 13:07
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0006_location_paid'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='location',
-            name='paid',
-        ),
-        migrations.AddField(
-            model_name='roguser',
-            name='paid',
-            field=models.BooleanField(default=False, verbose_name='Is Paid'),
-        ),
-    ]

rog/migrations/0008_alter_roguser_parammeters.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-06-07 13:09
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0007_auto_20220607_2207'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='roguser',
-            name='parammeters',
-            field=models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters'),
-        ),
-    ]

rog/migrations/0009_remove_roguser_email.py

@@ -1,17 +0,0 @@
-# Generated by Django 3.2.9 on 2022-06-07 14:24
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0008_alter_roguser_parammeters'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='roguser',
-            name='email',
-        ),
-    ]

rog/migrations/0010_useractions_checkinimage.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-06-10 06:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0009_remove_roguser_email'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='useractions',
-            name='checkinimage',
-            field=models.FileField(blank=True, null=True, upload_to='%y%m%d'),
-        ),
-    ]

rog/migrations/0011_usertracks.py

@@ -1,25 +0,0 @@
-# Generated by Django 3.2.9 on 2022-06-12 18:11
-
-from django.conf import settings
-import django.contrib.gis.db.models.fields
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0010_useractions_checkinimage'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='UserTracks',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('geom', django.contrib.gis.db.models.fields.MultiPointField(srid=4326)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]

rog/migrations/0012_auto_20220613_1758.py

@@ -1,113 +0,0 @@
-# Generated by Django 3.2.9 on 2022-06-13 08:58
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0011_usertracks'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='location',
-            name='address',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Address'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='area',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Area'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='category',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Category'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='city',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='City'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='email',
-            field=models.EmailField(blank=True, max_length=2048, null=True, verbose_name='Email'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='event_name',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Event name'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='facility',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Facility'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='fax',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Fax'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='group',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Group'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='location_name',
-            field=models.CharField(default='--- 場所をお願いします --', max_length=2048, verbose_name='Location Name'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='parammeters',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Parameters'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='phone',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Phone'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='photos',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Phptos'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='portal',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Portal'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='prefecture',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Prefecture'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='remark',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Remarks'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='status',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Status'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='tags',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Tags'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='videos',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Videos'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='webcontents',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Web Content'),
-        ),
-    ]

rog/migrations/0013_auto_20220618_1847.py

@@ -1,88 +0,0 @@
-# Generated by Django 3.2.9 on 2022-06-18 09:47
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0012_auto_20220613_1758'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='location',
-            name='buy_point',
-            field=models.IntegerField(blank=True, default=0, null=True, verbose_name='buy Point'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='checkin_point',
-            field=models.IntegerField(blank=True, default=10, null=True, verbose_name='Checkin Point'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='checkin_radius',
-            field=models.IntegerField(blank=True, default=15, null=True, verbose_name='Checkin radious'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='evaluation_value',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Evaluation value (評価)'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='hidden_location',
-            field=models.BooleanField(default=False, verbose_name='Is Hidden Location'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='opening_hours_fri',
-            field=models.TimeField(blank=True, null=True, verbose_name='Opening hours frinday (金曜)'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='opening_hours_mon',
-            field=models.TimeField(blank=True, null=True, verbose_name='Opening hours monday (月曜)'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='opening_hours_sat',
-            field=models.TimeField(blank=True, null=True, verbose_name='Opening hours saturday (土曜)'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='opening_hours_sun',
-            field=models.TimeField(blank=True, null=True, verbose_name='Opening hours sunday (日曜)'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='opening_hours_thu',
-            field=models.TimeField(blank=True, null=True, verbose_name='Opening hours thursday (木曜)'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='opening_hours_tue',
-            field=models.TimeField(blank=True, null=True, verbose_name='Opening hours tuesday (火曜)'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='opening_hours_wed',
-            field=models.TimeField(blank=True, null=True, verbose_name='Opening hours wednesday (水曜)'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='shop_closed',
-            field=models.BooleanField(default=False, verbose_name='Shop Closed (休業)'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='shop_shutdown',
-            field=models.BooleanField(default=False, null=True, verbose_name='Shop Shutdown (閉業)'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='auto_checkin',
-            field=models.BooleanField(default=False, verbose_name='Is AutoCheckin'),
-        ),
-    ]

rog/migrations/0014_alter_location_shop_shutdown.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-06-18 09:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0013_auto_20220618_1847'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='location',
-            name='shop_shutdown',
-            field=models.BooleanField(default=False, verbose_name='Shop Shutdown (閉業)'),
-        ),
-    ]

rog/migrations/0015_auto_20220619_1611.py

@@ -1,57 +0,0 @@
-# Generated by Django 3.2.9 on 2022-06-19 07:11
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0014_alter_location_shop_shutdown'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='location',
-            name='checkin_radious',
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='opening_hours_fri',
-            field=models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours frinday (金曜)'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='opening_hours_mon',
-            field=models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours monday (月曜)'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='opening_hours_sat',
-            field=models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours saturday (土曜)'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='opening_hours_sun',
-            field=models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours sunday (日曜)'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='opening_hours_thu',
-            field=models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours thursday (木曜)'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='opening_hours_tue',
-            field=models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours tuesday (火曜)'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='opening_hours_wed',
-            field=models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours wednesday (水曜)'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='photos',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Photos'),
-        ),
-    ]

rog/migrations/0016_shapefilelocations.py

@@ -1,21 +0,0 @@
-# Generated by Django 3.2.9 on 2022-06-21 09:46
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0015_auto_20220619_1611'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ShapeFileLocations',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('shapefile', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Shapelayer')),
-                ('locid', models.IntegerField(blank=True, null=True)),
-            ],
-        ),
-    ]

rog/migrations/0017_auto_20220725_1605.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.2.9 on 2022-07-25 07:05
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0016_shapefilelocations'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='location',
-            name='cp',
-            field=models.IntegerField(blank=True, null=True, verbose_name='Check Point'),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='subcategory',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Sub Category'),
-        ),
-    ]

rog/migrations/0018_auto_20220816_1616.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-16 07:16
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0017_auto_20220725_1605'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='location',
-            name='sub_loc_id',
-            field=models.IntegerField(blank=True, null=True, verbose_name='Sub location id'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='cp',
-            field=models.FloatField(blank=True, null=True, verbose_name='Check Point'),
-        ),
-    ]

rog/migrations/0019_alter_location_checkin_radius.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-16 07:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0018_auto_20220816_1616'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='location',
-            name='checkin_radius',
-            field=models.FloatField(blank=True, default=15.0, null=True, verbose_name='Checkin radious'),
-        ),
-    ]

rog/migrations/0020_auto_20220816_1627.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-16 07:27
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0019_alter_location_checkin_radius'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='location',
-            name='buy_point',
-            field=models.FloatField(blank=True, default=0, null=True, verbose_name='buy Point'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='checkin_point',
-            field=models.FloatField(blank=True, default=10, null=True, verbose_name='Checkin Point'),
-        ),
-    ]

rog/migrations/0021_templocation.py

@@ -1,69 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-17 05:48
-
-from django.conf import settings
-import django.contrib.gis.db.models.fields
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0020_auto_20220816_1627'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='templocation',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('location_id', models.IntegerField(blank=True, null=True, verbose_name='Location id')),
-                ('sub_loc_id', models.IntegerField(blank=True, null=True, verbose_name='Sub location id')),
-                ('cp', models.FloatField(blank=True, null=True, verbose_name='Check Point')),
-                ('location_name', models.CharField(default='--- 場所をお願いします --', max_length=2048, verbose_name='Location Name')),
-                ('category', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Category')),
-                ('subcategory', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Sub Category')),
-                ('zip', models.CharField(blank=True, max_length=12, null=True, verbose_name='Zip code')),
-                ('address', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Address')),
-                ('prefecture', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Prefecture')),
-                ('area', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Area')),
-                ('city', models.CharField(blank=True, max_length=2048, null=True, verbose_name='City')),
-                ('latitude', models.FloatField(blank=True, null=True, verbose_name='Latitude')),
-                ('longitude', models.FloatField(blank=True, null=True, verbose_name='Latitude')),
-                ('photos', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Photos')),
-                ('videos', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Videos')),
-                ('webcontents', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Web Content')),
-                ('status', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Status')),
-                ('portal', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Portal')),
-                ('group', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Group')),
-                ('phone', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Phone')),
-                ('fax', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Fax')),
-                ('email', models.EmailField(blank=True, max_length=2048, null=True, verbose_name='Email')),
-                ('facility', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Facility')),
-                ('remark', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Remarks')),
-                ('tags', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Tags')),
-                ('event_name', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Event name')),
-                ('event_active', models.BooleanField(default=True, verbose_name='Is Event active')),
-                ('hidden_location', models.BooleanField(default=False, verbose_name='Is Hidden Location')),
-                ('auto_checkin', models.BooleanField(default=False, verbose_name='Is AutoCheckin')),
-                ('checkin_radius', models.FloatField(blank=True, default=15.0, null=True, verbose_name='Checkin radious')),
-                ('checkin_point', models.FloatField(blank=True, default=10, null=True, verbose_name='Checkin Point')),
-                ('buy_point', models.FloatField(blank=True, default=0, null=True, verbose_name='buy Point')),
-                ('evaluation_value', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Evaluation value (評価)')),
-                ('shop_closed', models.BooleanField(default=False, verbose_name='Shop Closed (休業)')),
-                ('shop_shutdown', models.BooleanField(default=False, verbose_name='Shop Shutdown (閉業)')),
-                ('opening_hours_mon', models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours monday (月曜)')),
-                ('opening_hours_tue', models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours tuesday (火曜)')),
-                ('opening_hours_wed', models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours wednesday (水曜)')),
-                ('opening_hours_thu', models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours thursday (木曜)')),
-                ('opening_hours_fri', models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours frinday (金曜)')),
-                ('opening_hours_sat', models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours saturday (土曜)')),
-                ('opening_hours_sun', models.CharField(blank=True, max_length=512, null=True, verbose_name='Opening hours sunday (日曜)')),
-                ('parammeters', models.CharField(blank=True, max_length=2048, null=True, verbose_name='Parameters')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('last_updated_at', models.DateTimeField(auto_now=True)),
-                ('geom', django.contrib.gis.db.models.fields.MultiPointField(srid=4326)),
-                ('last_updated_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='temp_location_updated_user', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]

rog/migrations/0022_auto_20220822_2319.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-22 14:19
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0021_templocation'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='shapelayers',
-            name='layerof',
-            field=models.IntegerField(choices=[(1, 'templocation'), (2, 'Location_line'), (3, 'Location_polygon')], default=1),
-        ),
-        migrations.AlterField(
-            model_name='templocation',
-            name='cp',
-            field=models.FloatField(default=0, null=True, verbose_name='Check Point'),
-        ),
-    ]

rog/migrations/0023_alter_location_cp.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-22 14:19
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0022_auto_20220822_2319'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='location',
-            name='cp',
-            field=models.FloatField(default=0, null=True, verbose_name='Check Point'),
-        ),
-    ]

rog/migrations/0024_customuser_group.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-29 14:11
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0023_alter_location_cp'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='customuser',
-            name='group',
-            field=models.CharField(choices=[('G1', '大垣-初心者'), ('G2', '大垣-３時間'), ('G3', '大垣-5時間')], default='G1', max_length=2),
-        ),
-    ]

rog/migrations/0025_userupload.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-30 05:26
-
-from django.db import migrations, models
-import rog.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0024_customuser_group'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='UserUpload',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255, verbose_name='User uploads')),
-                ('file', models.FileField(blank=True, upload_to=rog.models.get_file_path)),
-                ('uploaded_date', models.DateField(auto_now_add=True)),
-            ],
-        ),
-    ]

rog/migrations/0026_useruploaduser.py

@@ -1,21 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-30 10:05
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0025_userupload'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='UserUploadUser',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('userfile', models.CharField(blank=True, max_length=2048, null=True, verbose_name='User file')),
-                ('email', models.CharField(max_length=255, verbose_name='User Email')),
-            ],
-        ),
-    ]

rog/migrations/0027_alter_customuser_group.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-30 10:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0026_useruploaduser'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='customuser',
-            name='group',
-            field=models.CharField(choices=[('G1', '大垣-初心者'), ('G2', '大垣-３時間'), ('G3', '大垣-5時間')], default='G1', max_length=255),
-        ),
-    ]

rog/migrations/0028_alter_customuser_group.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-30 10:58
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0027_alter_customuser_group'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='customuser',
-            name='group',
-            field=models.CharField(choices=[('大垣-初心者', '大垣-初心者'), ('大垣-３時間', '大垣-３時間'), ('大垣-5時間', '大垣-5時間')], default='大垣-初心者', max_length=255),
-        ),
-    ]

rog/migrations/0029_auto_20220831_1317.py

@@ -1,24 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-31 04:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0028_alter_customuser_group'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='customuser',
-            name='area',
-            field=models.CharField(default='city', max_length=255),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='customuser',
-            name='cities',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-    ]

rog/migrations/0030_auto_20220831_1440.py

@@ -1,21 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-31 05:40
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0029_auto_20220831_1317'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='customuser',
-            name='area',
-        ),
-        migrations.RemoveField(
-            model_name='customuser',
-            name='cities',
-        ),
-    ]

rog/migrations/0031_auto_20220831_2244.py

@@ -1,28 +0,0 @@
-# Generated by Django 3.2.9 on 2022-08-31 13:44
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0030_auto_20220831_1440'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='EventUser',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='event', to='rog.event')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='user',
-            field=models.ManyToManyField(related_name='even', through='rog.EventUser', to=settings.AUTH_USER_MODEL),
-        ),
-    ]

rog/migrations/0032_alter_location_sub_loc_id.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-09-07 09:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0031_auto_20220831_2244'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='location',
-            name='sub_loc_id',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Sub location id'),
-        ),
-    ]

rog/migrations/0033_alter_templocation_sub_loc_id.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-09-09 13:18
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0032_alter_location_sub_loc_id'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='templocation',
-            name='sub_loc_id',
-            field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Sub location id'),
-        ),
-    ]

rog/migrations/0034_alter_customuser_email.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-10-06 10:51
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0033_alter_templocation_sub_loc_id'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='customuser',
-            name='email',
-            field=models.CharField(max_length=255, verbose_name='user name'),
-        ),
-    ]

rog/migrations/0035_alter_customuser_email.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-10-06 10:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0034_alter_customuser_email'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='customuser',
-            name='email',
-            field=models.EmailField(max_length=254, unique=True, verbose_name='user name'),
-        ),
-    ]

rog/migrations/0036_alter_customuser_email.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-10-06 11:01
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0035_alter_customuser_email'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='customuser',
-            name='email',
-            field=models.CharField(max_length=255, unique=True, verbose_name='Email'),
-        ),
-    ]

rog/migrations/0037_customuser_is_rogaining.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2022-10-06 13:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0036_alter_customuser_email'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='customuser',
-            name='is_rogaining',
-            field=models.BooleanField(default=False),
-        ),
-    ]

rog/migrations/0038_auto_20221016_1950.py

@@ -1,28 +0,0 @@
-# Generated by Django 3.2.9 on 2022-10-16 10:50
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0037_customuser_is_rogaining'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='customuser',
-            name='event_code',
-            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Event Code'),
-        ),
-        migrations.AddField(
-            model_name='customuser',
-            name='team_name',
-            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Team Name'),
-        ),
-        migrations.AddField(
-            model_name='customuser',
-            name='zekken_number',
-            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Zekken Number'),
-        ),
-    ]

rog/migrations/0039_goalimages.py

@@ -1,27 +0,0 @@
-# Generated by Django 3.2.9 on 2022-10-17 11:39
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0038_auto_20221016_1950'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='GoalImages',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('goalimage', models.FileField(blank=True, null=True, upload_to='%y%m%d')),
-                ('goaltime', models.DateTimeField(verbose_name='Goal time')),
-                ('team_name', models.CharField(max_length=255, verbose_name='Team name')),
-                ('event_code', models.CharField(max_length=255, verbose_name='event code')),
-                ('cp_number', models.IntegerField(verbose_name='CP numner')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]

rog/migrations/0040_auto_20221105_1939.py

@@ -1,32 +0,0 @@
-# Generated by Django 3.2.9 on 2022-11-05 10:39
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0039_goalimages'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='goalimages',
-            name='goalimage',
-            field=models.FileField(blank=True, null=True, upload_to='goals/%y%m%d'),
-        ),
-        migrations.CreateModel(
-            name='CheckinImages',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('checkinimage', models.FileField(blank=True, null=True, upload_to='checkin/%y%m%d')),
-                ('checkintime', models.DateTimeField(verbose_name='Goal time')),
-                ('team_name', models.CharField(max_length=255, verbose_name='Team name')),
-                ('event_code', models.CharField(max_length=255, verbose_name='event code')),
-                ('cp_number', models.IntegerField(verbose_name='CP numner')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]

rog/migrations/0041_auto_20230526_1724.py

@@ -1,49 +0,0 @@
-# Generated by Django 3.2.9 on 2023-05-26 08:24
-
-import django.contrib.postgres.indexes
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rog', '0040_auto_20221105_1939'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='JpnAdminPerf',
-        ),
-        migrations.DeleteModel(
-            name='JpnSubPerf',
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='category',
-            field=models.CharField(blank=True, db_index=True, max_length=2048, null=True, verbose_name='Category'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='event_active',
-            field=models.BooleanField(db_index=True, default=True, verbose_name='Is Event active'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='event_name',
-            field=models.CharField(blank=True, db_index=True, max_length=2048, null=True, verbose_name='Event name'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='group',
-            field=models.CharField(blank=True, db_index=True, max_length=2048, null=True, verbose_name='Group'),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='location_id',
-            field=models.IntegerField(blank=True, db_index=True, null=True, verbose_name='Location id'),
-        ),
-        migrations.AddIndex(
-            model_name='location',
-            index=django.contrib.postgres.indexes.GistIndex(fields=['geom'], name='rog_locatio_geom_4793cc_gist'),
-        ),
-    ]

rog/models.py

@@ -24,6 +24,11 @@ from django.db import transaction
 from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin, BaseUserManager
 from django.contrib.postgres.indexes import GistIndex
 
+from django.contrib.auth.hashers import make_password
+
+from django.utils import timezone
+from datetime import timedelta
+
 import csv
 import codecs
 import sys
@@ -33,7 +38,7 @@ import uuid
 env = environ.Env(DEBUG=(bool, False))
 environ.Env.read_env(env_file=".env")
 
-db = Db(dbname=env("POSTGRES_DBNAME"), user=env("POSTGRES_USER"), password=env("POSTGRES_PASS"), host="postgres-db", port=env("PG_PORT"))
+db = Db(dbname=env("POSTGRES_DBNAME"), user=env("POSTGRES_USER"), password=env("POSTGRES_PASS"), host=env("PG_HOST"), port=env("PG_PORT"))
 
 
 def get_file_path(instance, filename):
@@ -61,35 +66,163 @@ def remove_bom_inplace(path):
             fp.seek(-bom_length, os.SEEK_CUR)
             fp.truncate()
 
-
+#========== Akira ここから
 class CustomUserManager(BaseUserManager):
     
-    def create_user(self, email, password, group, event_code, team_name, **other_fields):
+    def create_user(self, email, password, group, firstname, lastname, event_code, team_name, date_of_birth, **other_fields):
-
         if not email:
             raise ValueError(_("You must provide an email address"))
 
-        # email = self.normalize_email(email)
+        # ユニークなuseridを生成
-        user=self.model(email=email, group=group, event_code=event_code, team_name=team_name, zekken_number=email, is_rogaining=True, **other_fields)
+        userid = str(uuid.uuid4())
+
+        user = self.model(
+            email=self.normalize_email(email),
+            group=group,
+            firstname=firstname,
+            lastname=lastname,
+            userid=userid,
+            event_code=event_code,
+            team_name=team_name,
+            zekken_number=email,    # 自動番号設定を考えること
+            is_rogaining=True,
+            date_of_birth=date_of_birth,
+        )        
         user.set_password(password)
         user.save()
 
         return user
 
+    def create_superuser(self, email, password, group, firstname, lastname, event_code=None, team_name=None, date_of_birth=None, **other_fields):
+        if event_code is None:
+            event_code = 'test'  # replace this with some default value
+        if team_name is None:
+            team_name = 'test'  # replace this with some default value
 
-    def create_superuser(self, email, password, group, **other_fields):
         other_fields.setdefault('is_staff', True)
         other_fields.setdefault('is_superuser', True)
         other_fields.setdefault('is_active', True)
 
         if other_fields.get('is_staff') is not True:
-            raise ValueError(_('Supperuser must assigned to staff'))
+            raise ValueError(_('Superuser must be assigned to staff'))
         if other_fields.get('is_superuser') is not True:
-            raise ValueError(_('Supperuser must assigned to superuser=True'))
+            raise ValueError(_('Superuser must have is_superuser set to True'))
 
-        return self.create_user(email, password, group, **other_fields)
+        user = self.create_user(
+            email=self.normalize_email(email),
+            group=group,
+            firstname=firstname,
+            lastname=lastname,
+            password=password,
+        )
+        user.is_staff = True
+        user.is_superuser = True
+        user.is_active = True
+        user.save(using=self._db)
+        return user
 
 
+'''
+        # Providing default values for event_code and team_name if they are not provided
+        if event_code is None:
+            event_code = 'test'  # replace this with some default value
+        if team_name is None:
+            team_name = 'test'  # replace this with some default value
+
+        other_fields.setdefault('is_staff', True)
+        other_fields.setdefault('is_superuser', True)
+        other_fields.setdefault('is_active', True)
+
+        if other_fields.get('is_staff') is not True:
+            raise ValueError(_('Superuser must be assigned to staff'))
+        if other_fields.get('is_superuser') is not True:
+            raise ValueError(_('Superuser must have is_superuser set to True'))
+
+        return self.create_user(email, password, group, event_code, team_name, **other_fields)
+'''
+
+class CustomUser(AbstractBaseUser, PermissionsMixin):
+    email = models.EmailField(unique=True)
+    firstname = models.CharField(max_length=255)
+    lastname = models.CharField(max_length=255)
+    userid = models.CharField(max_length=255, unique=True)
+    date_of_birth = models.DateField()
+    is_active = models.BooleanField(default=True)
+    is_staff = models.BooleanField(default=False)
+    event_code = models.CharField(max_length=255, blank=True, null=True)
+    team_name = models.CharField(max_length=255, blank=True, null=True)
+    zekken_number = models.CharField(max_length=255, blank=True, null=True)
+
+    objects = CustomUserManager()
+
+    USERNAME_FIELD = 'email'
+    REQUIRED_FIELDS = ['firstname', 'lastname', 'userid', 'date_of_birth']
+
+    def __str__(self):
+        return self.email
+
+class TempUser(models.Model):
+    email = models.EmailField(unique=True)
+    password = models.CharField(max_length=128)
+    is_rogaining = models.BooleanField(default=False)
+    zekken_number = models.CharField(max_length=255, blank=True, null=True)
+    event_code = models.CharField(max_length=255, blank=True, null=True)
+    team_name = models.CharField(max_length=255, blank=True, null=True)
+    group = models.CharField(max_length=255)
+    verification_code = models.UUIDField(default=uuid.uuid4, editable=False)
+    created_at = models.DateTimeField(auto_now_add=True)
+    expires_at = models.DateTimeField()
+
+    def __str__(self):
+        return self.email
+
+    def save(self, *args, **kwargs):
+        if not self.expires_at:
+            self.expires_at = timezone.now() + timedelta(hours=24)  # 24時間の有効期限
+        super().save(*args, **kwargs)
+
+    def is_valid(self):
+        return timezone.now() <= self.expires_at
+
+
+
+class Team(models.Model):
+    zekken_number = models.CharField(max_length=255, primary_key=True)
+    team_name = models.CharField(max_length=255)
+    password = models.CharField(max_length=128)
+
+    def __str__(self):
+        return f"{self.zekken_number} - {self.team_name}"
+
+
+class Member(models.Model):
+    zekken_number = models.ForeignKey(Team, on_delete=models.CASCADE)
+    userid = models.ForeignKey(CustomUser, on_delete=models.CASCADE)
+
+    class Meta:
+        unique_together = ('zekken_number', 'userid')
+
+    def __str__(self):
+        return f"{self.zekken_number} - {self.userid}"
+
+
+
+
+class Entry(models.Model):
+    zekken_number = models.ForeignKey(Team, on_delete=models.CASCADE)
+    event_code = models.CharField(max_length=255)
+    date = models.DateField()
+
+    class Meta:
+        unique_together = ('zekken_number', 'event_code', 'date')
+
+    def __str__(self):
+        return f"{self.zekken_number} - {self.event_code} - {self.date}"
+
+
+
+#============= Akira ここまで
+
 
 class JpnAdminMainPerf(models.Model):
     geom = models.MultiPolygonField(blank=True, null=True)
@@ -109,6 +242,7 @@ class JpnAdminMainPerf(models.Model):
         ]
 
 
+
 # class JpnAdminPerf(models.Model):
 #     geom = models.MultiLineStringField(blank=True, null=True)
 #     et_id = models.IntegerField(blank=True, null=True)
@@ -194,7 +328,7 @@ class UserUploadUser(models.Model):
     email=models.CharField(_('User Email'), max_length=255)
 
 
-class CustomUser(AbstractBaseUser, PermissionsMixin):
+class CustomUser_old(AbstractBaseUser, PermissionsMixin):
     class Groups(models.TextChoices):
         GB1 = '大垣-初心者', '大垣-初心者'
         GB2 = '大垣-３時間', '大垣-３時間'

rog/serializers.py

@@ -1,14 +1,16 @@
 from rest_framework import serializers
 from rest_framework_gis.serializers import GeoFeatureModelSerializer
 from sqlalchemy.sql.functions import mode
-from .models import Location, Location_line, Location_polygon, JpnAdminMainPerf, Useractions, GifuAreas, RogUser, UserTracks, GoalImages, CheckinImages,CustomUser
+from .models import Location, Location_line, Location_polygon, JpnAdminMainPerf, Useractions, GifuAreas, RogUser, UserTracks, GoalImages, CheckinImages,CustomUser, Team, Member, Entry
 from drf_extra_fields.fields import Base64ImageField
+from django.contrib.auth.hashers import make_password
 
 #from django.contrib.auth.models import User
 from .models import CustomUser
 from django.contrib.auth import authenticate
 
 from .models import TestModel
+from .models import TempUser
 
 
 class LocationCatSerializer(serializers.ModelSerializer):
@@ -53,6 +55,39 @@ class JPN_main_perfSerializer(serializers.ModelSerializer):
 #         model=JpnAdminPerf
 #         fields=['id','et_id', 'et_right', 'et_left', 'adm2_l', 'adm1_l', 'adm0_l', 'adm0_r', 'adm1_r', 'adm2_r', 'admlevel']
 
+#============= Akira ここから
+class TeamSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Team
+        fields = ['zekken_number', 'team_name', 'password']
+        extra_kwargs = {'password': {'write_only': True}}
+
+class MemberSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Member
+        fields = ['zekken_number', 'userid']
+
+class EntrySerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Entry
+        fields = ['zekken_number', 'event_code', 'date']
+
+class CustomUserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = CustomUser
+        fields = ['email', 'firstname', 'lastname', 'userid', 'date_of_birth', 'password']
+        extra_kwargs = {
+            'password': {'write_only': True},
+            'userid': {'read_only': True}
+        }
+
+    def create(self, validated_data):
+        validated_data['password'] = make_password(validated_data.get('password'))
+        return super(CustomUserSerializer, self).create(validated_data)
+
+
+#============= Akira ここまで
+
 
 class GifuAreaSerializer(serializers.ModelSerializer):
     class Meta:

rog/urls.py

@@ -1,7 +1,8 @@
 from sys import prefix
 from rest_framework import urlpatterns
 from rest_framework.routers import DefaultRouter
-from .views import LocationViewSet, Location_lineViewSet, Location_polygonViewSet, Jpn_Main_PerfViewSet, LocationsInPerf, ExtentForSubPerf, SubPerfInMainPerf, ExtentForMainPerf, LocationsInSubPerf, CatView, RegistrationAPI, LoginAPI, UserAPI, UserActionViewset, UserMakeActionViewset, UserDestinations, UpdateOrder, LocationInBound, DeleteDestination, CustomAreaLocations, GetAllGifuAreas, CustomAreaNames, userDetials, UserTracksViewSet, CatByCity, ChangePasswordView, GoalImageViewSet, CheckinImageViewSet, ExtentForLocations, DeleteAccount, PrivacyView, RegistrationView
+from .views import LocationViewSet, Location_lineViewSet, Location_polygonViewSet, Jpn_Main_PerfViewSet, LocationsInPerf, ExtentForSubPerf, SubPerfInMainPerf, ExtentForMainPerf, LocationsInSubPerf, CatView, RegistrationAPI, LoginAPI, UserAPI, UserActionViewset, UserMakeActionViewset, UserDestinations, UpdateOrder, LocationInBound, DeleteDestination, CustomAreaLocations, GetAllGifuAreas, CustomAreaNames, userDetials, UserTracksViewSet, CatByCity, ChangePasswordView, GoalImageViewSet, CheckinImageViewSet, ExtentForLocations, DeleteAccount, PrivacyView, RegistrationView, VerifyEmailView, TeamViewSet, MemberViewSet, EntryViewSet
+
 from django.urls import path, include
 from knox import views as knox_views
 
@@ -18,6 +19,17 @@ router.register(prefix='track', viewset=UserTracksViewSet, basename='track')
 router.register(prefix='goalimage', viewset=GoalImageViewSet, basename='goalimage')
 router.register(prefix='checkinimage', viewset=CheckinImageViewSet, basename='checkinimage')
 
+#Akira 追加
+# /api/teams/ - チームの一覧取得と作成
+# /api/teams/<pk>/ - 特定のチームの取得、更新、削除
+# /api/members/ - メンバーの一覧取得と作成
+# /api/members/<pk>/ - 特定のメンバーの取得、更新、削除
+# /api/entries/ - エントリーの一覧取得と作成
+# /api/entries/<pk>/ - 特定のエントリーの取得、更新、削除
+#
+router.register(r'teams', TeamViewSet)
+router.register(r'members', MemberViewSet)
+router.register(r'entries', EntryViewSet)
 
 urlpatterns = router.urls
 
@@ -48,5 +60,7 @@ urlpatterns += [
     path('delete-account/', DeleteAccount, name="delete-account"),
     path('privacy/', PrivacyView, name='privacy-view'),
     path('register', RegistrationView.as_view(), name='register'),
+    path('verify-email/<uuid:verification_code>/', VerifyEmailView.as_view(), name='verify_email'),
+
     # path('goal-image/', GoalImageViewSet.as_view(), name='goal-image')
 ]

rog/views.py

@@ -1,15 +1,16 @@
 from curses.ascii import NUL
 from django.core.serializers import serialize
-from .models import GoalImages, Location, Location_line, Location_polygon, JpnAdminMainPerf, Useractions, GifuAreas, RogUser, CustomUser, UserTracks, GoalImages, CheckinImages
+from .models import GoalImages, Location, Location_line, Location_polygon, JpnAdminMainPerf, Useractions, GifuAreas, RogUser, CustomUser, UserTracks, GoalImages, CheckinImages, TempUser
-from rest_framework import viewsets
+from rest_framework import viewsets,status
-from .serializers import LocationSerializer, Location_lineSerializer, Location_polygonSerializer, JPN_main_perfSerializer, LocationCatSerializer, CreateUserSerializer, UserSerializer, LoginUserSerializer, UseractionsSerializer, UserDestinationSerializer, GifuAreaSerializer, LocationEventNameSerializer, RogUserSerializer, UserTracksSerializer, ChangePasswordSerializer, GolaImageSerializer, CheckinImageSerializer, RegistrationSerializer
+from .serializers import LocationSerializer, Location_lineSerializer, Location_polygonSerializer, JPN_main_perfSerializer, LocationCatSerializer, CreateUserSerializer, UserSerializer, LoginUserSerializer, UseractionsSerializer, UserDestinationSerializer, GifuAreaSerializer, LocationEventNameSerializer, RogUserSerializer, UserTracksSerializer, ChangePasswordSerializer, GolaImageSerializer, CheckinImageSerializer, RegistrationSerializer, Team, Member, Entry, CustomUserSerializer
+
 from knox.models import AuthToken
 
 from rest_framework import viewsets, generics, status
 from rest_framework.decorators import action
 from rest_framework.response import Response
 from rest_framework.parsers import JSONParser, MultiPartParser
-from .serializers import LocationSerializer
+from .serializers import LocationSerializer, TeamSerializer, MemberSerializer, EntrySerializer
 from django.http import JsonResponse
 from rest_framework.permissions import IsAuthenticated 
 from django.contrib.gis.db.models import Extent, Union
@@ -29,8 +30,9 @@ from rest_framework.parsers import JSONParser, MultiPartParser
 from django.views.decorators.csrf import csrf_exempt
 import uuid
 from django.shortcuts import render
+from django.utils import timezone
 
-
+from django.db import transaction
 
 class LocationViewSet(viewsets.ModelViewSet):
     queryset=Location.objects.all()
@@ -53,6 +55,113 @@ class Jpn_Main_PerfViewSet(viewsets.ModelViewSet):
     serializer_class=JPN_main_perfSerializer
     filter_fields = ["adm1_ja"]
 
+#===== AKira ここから
+
+class CustomUserViewSet(viewsets.ModelViewSet):
+    queryset = CustomUser.objects.all()
+    serializer_class = CustomUserSerializer
+    permission_classes = [IsAuthenticated]
+
+    def get_queryset(self):
+        return CustomUser.objects.filter(id=self.request.user.id)
+
+class TeamViewSet(viewsets.ModelViewSet):
+    queryset = Team.objects.all()
+    serializer_class = TeamSerializer
+
+    @transaction.atomic
+    def create(self, request, *args, **kwargs):
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        self.perform_create(serializer)
+        headers = self.get_success_headers(serializer.data)
+
+        # チーム登録後にエントリー登録と外部APIコールを行う
+        self.register_entry_and_call_external_api(serializer.data)
+
+        return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
+
+    def register_entry_and_call_external_api(self, team_data):
+        # エントリーの登録
+        entry_data = {
+            'zekken_number': team_data['zekken_number'],
+            'event_code': request.data.get('event_code'),  # エントリー用のevent_codeを取得
+            'date': request.data.get('date')  # エントリー用の日付を取得
+        }
+        entry_serializer = EntrySerializer(data=entry_data)
+        if entry_serializer.is_valid():
+            entry_serializer.save()
+
+            # 外部APIへのコール
+            self.call_external_api(team_data, entry_data)
+        else:
+            # エントリー登録に失敗した場合のエラーハンドリング
+            raise serializers.ValidationError(entry_serializer.errors)
+
+    def call_external_api(self, team_data, entry_data):
+        external_api_url = "https://rogaining.sumasen.net/gifuroge/register_team"
+
+        payload = {
+            'zekken_number': team_data['zekken_number'],
+            'event_code': entry_data['event_code'],
+            'team_name': team_data['team_name'],
+            'class_name': team_data.get('class_name', 'Default'),  # class_nameがない場合はデフォルト値を設定
+            'password': team_data['password']
+        }
+
+        try:
+            response = requests.post(external_api_url, data=payload)
+            response.raise_for_status()  # エラーレスポンスの場合は例外を発生させる
+
+            # レスポンスの処理（必要に応じて）
+            print(f"External API response: {response.json()}")
+        except requests.RequestException as e:
+            # 外部APIコールに失敗した場合のエラーハンドリング
+            print(f"Failed to call external API: {str(e)}")
+            # ここでエラーをログに記録したり、管理者に通知したりすることができます
+
+
+    def get_queryset(self):
+        user = self.request.user
+        return Team.objects.filter(member__userid=user)
+
+class MemberViewSet(viewsets.ModelViewSet):
+    queryset = Member.objects.all()
+    serializer_class = MemberSerializer
+    permission_classes = [IsAuthenticated]
+
+    def create(self, request):
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        self.perform_create(serializer)
+        headers = self.get_success_headers(serializer.data)
+        return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
+
+    def get_queryset(self):
+        user = self.request.user
+        return Member.objects.filter(userid=user)
+
+
+
+class EntryViewSet(viewsets.ModelViewSet):
+    queryset = Entry.objects.all()
+    serializer_class = EntrySerializer
+    permission_classes = [IsAuthenticated]
+
+    def create(self, request):
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        self.perform_create(serializer)
+        headers = self.get_success_headers(serializer.data)
+        return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
+
+    def get_queryset(self):
+        user = self.request.user
+        return Entry.objects.filter(zekken_number__member__userid=user)
+
+
+
+#===== AKira ここまで
 
 
 class UserTracksViewSet(viewsets.ModelViewSet):    
@@ -273,6 +382,7 @@ class RegistrationAPI(generics.GenericAPIView):
             "token": AuthToken.objects.create(user)[1]
         })
 
+
 class LoginAPI(generics.GenericAPIView):
     serializer_class = LoginUserSerializer
 
@@ -339,6 +449,15 @@ class CheckinImageViewSet(viewsets.ModelViewSet):
         return queryset
     
 
+class RetrieveUserView(generics.RetrieveAPIView):
+    queryset = CustomUser.objects.all()
+    serializer_class = UserSerializer
+    permission_classes = [IsAuthenticated]
+
+    def get_object(self):
+        return self.request.user
+
+
 def userDetials(request):
     user_id = request.GET.get('user_id')
     user = CustomUser.objects.get(id=user_id)
@@ -540,10 +659,54 @@ class TestActionViewSet(viewsets.ModelViewSet):
 def PrivacyView(request):
     return render(request, "rog/privacy.html")
 
-class RegistrationView(APIView):
+class RegistrationView_old(APIView):
     def post(self, request):
         serializer = RegistrationSerializer(data=request.data)
         if serializer.is_valid():
             serializer.save()
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+class RegistrationView(APIView):
+    def post(self, request):
+        serializer = RegistrationSerializer(data=request.data)
+        if serializer.is_valid():
+            temp_user = serializer.save()
+            verification_url = request.build_absolute_uri(
+                reverse('verify_email', kwargs={'verification_code': temp_user.verification_code})
+            )
+            send_mail(
+                'Verify your email',
+                f'Please click the link to verify your email: {verification_url}',
+                settings.DEFAULT_FROM_EMAIL,
+                [temp_user.email],
+                fail_silently=False,
+            )
+            return Response({"message": "Please check your email to complete registration."}, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+
+class VerifyEmailView(APIView):
+    def get(self, request, verification_code):
+        try:
+            temp_user = TempUser.objects.get(verification_code=verification_code)
+            if not temp_user.is_valid():
+                temp_user.delete()
+                return Response({"error": "Verification link has expired. Please register again."}, status=status.HTTP_400_BAD_REQUEST)
+
+            user = CustomUser.objects.create_user(
+                email=temp_user.email,
+                password=temp_user.password,
+                is_rogaining=temp_user.is_rogaining,
+                zekken_number=temp_user.zekken_number,
+                event_code=temp_user.event_code,
+                team_name=temp_user.team_name,
+                group=temp_user.group
+            )
+            temp_user.delete()
+            return Response({"message": "Email verified. Registration complete."}, status=status.HTTP_200_OK)
+        except TempUser.DoesNotExist:
+            return Response({"error": "Invalid verification code."}, status=status.HTTP_400_BAD_REQUEST)
+
+
+