temp update

rog/models.py

@@ -1,3 +1,4 @@
+from django.contrib.auth.hashers import make_password
 from dataclasses import field
 import email
 from enum import unique
@@ -146,28 +147,28 @@ class JpnAdminMainPerf(models.Model):
 # ###
 # ### Cities
 # ###
-# class JpnSubPerf(models.Model):
-#     geom = models.MultiPolygonField(blank=True, null=True)
-#     adm0_en = models.CharField(max_length=254, blank=True, null=True)
-#     adm0_ja = models.CharField(max_length=254, blank=True, null=True)
-#     adm0_pcode = models.CharField(max_length=254, blank=True, null=True)
-#     adm1_en = models.CharField(max_length=254, blank=True, null=True)
-#     adm1_ja = models.CharField(max_length=254, blank=True, null=True)
-#     adm1_pcode = models.CharField(max_length=254, blank=True, null=True)
-#     adm2_ja = models.CharField(max_length=254, blank=True, null=True)
-#     adm2_en = models.CharField(max_length=254, blank=True, null=True)
-#     adm2_pcode = models.CharField(max_length=254, blank=True, null=True)
-#     name_modified = models.CharField(max_length=254, blank=True, null=True)
-#     area_name = models.CharField(max_length=254, blank=True, null=True)
-#     list_order =models.IntegerField(default=0)
+class JpnSubPerf(models.Model):
+     geom = models.MultiPolygonField(blank=True, null=True)
+     adm0_en = models.CharField(max_length=254, blank=True, null=True)
+     adm0_ja = models.CharField(max_length=254, blank=True, null=True)
+     adm0_pcode = models.CharField(max_length=254, blank=True, null=True)
+     adm1_en = models.CharField(max_length=254, blank=True, null=True)
+     adm1_ja = models.CharField(max_length=254, blank=True, null=True)
+     adm1_pcode = models.CharField(max_length=254, blank=True, null=True)
+     adm2_ja = models.CharField(max_length=254, blank=True, null=True)
+     adm2_en = models.CharField(max_length=254, blank=True, null=True)
+     adm2_pcode = models.CharField(max_length=254, blank=True, null=True)
+     name_modified = models.CharField(max_length=254, blank=True, null=True)
+     area_name = models.CharField(max_length=254, blank=True, null=True)
+     list_order =models.IntegerField(default=0)
 
-#     class Meta:
-#         managed = False
-#         db_table = 'jpn_sub_perf'
-#         indexes = [
-#             models.Index(fields=['geom'], name='jpn_sub_perf_geom_idx'),
-#             # Add other fields for indexing as per the requirements
-#        ]
+     class Meta:
+         managed = False
+         db_table = 'jpn_sub_perf'
+         indexes = [
+             models.Index(fields=['geom'], name='jpn_sub_perf_geom_idx'),
+             # Add other fields for indexing as per the requirements
+        ]
 
 ###
 ### Gifu Areas
@@ -234,6 +235,10 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
 
     objects = CustomUserManager()
 
+    def set_password(self, raw_password):
+        self.password = make_password(raw_password)
+        self._password = raw_password
+
     def __str__(self):
         return self.email
 
@@ -253,6 +258,20 @@ class TempUser(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     expires_at = models.DateTimeField()
 
+    def set_password(self, raw_password):
+        self.password = make_password(raw_password)
+
+    def check_password(self, raw_password):
+        return check_password(raw_password, self.password)
+
+    # TempUserの作成時にこのメソッドを使用
+    @classmethod
+    def create_temp_user(cls, email, password, **kwargs):
+        temp_user = cls(email=email, **kwargs)
+        temp_user.set_password(password)
+        temp_user.save()
+        return temp_user
+
     def __str__(self):
         return self.email