Merge pull request #85 from hibiya-itchief/sharepointを追加できない

データベースの長さを変更
hibiya-itchief · Sep 23, 2024 · 17f43ca · 17f43ca · github-actions · Sep 23, 2024
2 parents 8e6608b + 9d7ca01
commit 17f43ca
Show file tree

Hide file tree

Showing 2 changed files with 145 additions and 54 deletions.
diff --git a/app/models.py b/app/models.py
@@ -1,8 +1,20 @@
-#from numpy import integer
-#from pandas import notnull
-from sqlalchemy import (TEXT, TIMESTAMP, VARCHAR, Boolean, Column, DateTime,
-                        ForeignKey, Integer, String, UniqueConstraint, text)
+# from numpy import integer
+# from pandas import notnull
+from sqlalchemy import (
+    TEXT,
+    TIMESTAMP,
+    VARCHAR,
+    Boolean,
+    Column,
+    DateTime,
+    ForeignKey,
+    Integer,
+    String,
+    UniqueConstraint,
+    text,
+)
 from sqlalchemy.orm import relationship
+
 # from sqlalchemy.dialects.mysql import TIMESTAMP as Timestamp
 from sqlalchemy.sql.functions import current_timestamp
 
@@ -12,105 +24,148 @@
 class Event(Base):
     __tablename__ = "events"
 
-    id = Column(VARCHAR(255),primary_key=True,index=True,unique=True)#ULID
-    group_id = Column(VARCHAR(255), ForeignKey("groups.id"),nullable=False)
+    id = Column(VARCHAR(255), primary_key=True, index=True, unique=True)  # ULID
+    group_id = Column(VARCHAR(255), ForeignKey("groups.id"), nullable=False)
     eventname = Column(VARCHAR(255))
 
     # 日時はISO 8601形式で文字列として保存 MySQLによって勝手にタイムゾーンをいじられたり保存されなかったりしたくない
-    starts_at = Column(VARCHAR(255),nullable=False)
-    ends_at = Column(VARCHAR(255),nullable=False)
-    sell_starts = Column(VARCHAR(255),nullable=False)
-    sell_ends = Column(VARCHAR(255),nullable=False)
+    starts_at = Column(VARCHAR(255), nullable=False)
+    ends_at = Column(VARCHAR(255), nullable=False)
+    sell_starts = Column(VARCHAR(255), nullable=False)
+    sell_ends = Column(VARCHAR(255), nullable=False)
 
     lottery = Column(Boolean)
 
-    target = Column(VARCHAR(255),nullable=False)
-    ticket_stock = Column(Integer,nullable=False)#0でチケット機能を使わない 
+    target = Column(VARCHAR(255), nullable=False)
+    ticket_stock = Column(Integer, nullable=False)  # 0でチケット機能を使わない
+
 
 class GroupTag(Base):
-    __tablename__="grouptag"
-    group_id = Column(VARCHAR(255),ForeignKey("groups.id"),nullable=False,primary_key=True)
-    tag_id = Column(VARCHAR(255),ForeignKey("tags.id"),nullable=False,primary_key=True)
+    __tablename__ = "grouptag"
+    group_id = Column(
+        VARCHAR(255), ForeignKey("groups.id"), nullable=False, primary_key=True
+    )
+    tag_id = Column(
+        VARCHAR(255), ForeignKey("tags.id"), nullable=False, primary_key=True
+    )
     # 複数カラムのunique constraint
-    __table_args__ = (UniqueConstraint("group_id", "tag_id", name="unique_idx_groupid_tagid"),)
+    __table_args__ = (
+        UniqueConstraint("group_id", "tag_id", name="unique_idx_groupid_tagid"),
+    )
+
 
 class Tag(Base):
     __tablename__ = "tags"
-    id = Column(VARCHAR(255),primary_key=True,index=True,unique=True)#ULID
-    tagname = Column(VARCHAR(255),unique=True,nullable=False)
+    id = Column(VARCHAR(255), primary_key=True, index=True, unique=True)  # ULID
+    tagname = Column(VARCHAR(255), unique=True, nullable=False)
+
 
 class Vote(Base):
     __tablename__ = "votes"
-    id = Column(VARCHAR(255),primary_key=True,index=True, unique=True)#ULID
+    id = Column(VARCHAR(255), primary_key=True, index=True, unique=True)  # ULID
     user_id = Column(VARCHAR(255), index=True, nullable=False)
-    group_id = Column(VARCHAR(255),ForeignKey("groups.id"),nullable=False)
+    group_id = Column(VARCHAR(255), ForeignKey("groups.id"), nullable=False)
+
 
 class Group(Base):
     __tablename__ = "groups"
-    id = Column(VARCHAR(255), primary_key=True, index=True,unique=True)#user defined unique id
+    id = Column(
+        VARCHAR(255), primary_key=True, index=True, unique=True
+    )  # user defined unique id
 
-    groupname = Column(VARCHAR(255), index=True,nullable=False)#団体名
+    groupname = Column(VARCHAR(255), index=True, nullable=False)  # 団体名
 
-    title = Column(VARCHAR(255))#演目名
-    description = Column(VARCHAR(255))#説明(一覧になったときに出る・イベントのデフォルトに使われる)
+    title = Column(VARCHAR(255))  # 演目名
+    description = Column(
+        VARCHAR(255)
+    )  # 説明(一覧になったときに出る・イベントのデフォルトに使われる)
 
-    enable_vote = Column(Boolean,default=True)#投票機能を使うか
+    enable_vote = Column(Boolean, default=True)  # 投票機能を使うか
     twitter_url = Column(VARCHAR(255))
     instagram_url = Column(VARCHAR(255))
     stream_url = Column(VARCHAR(255))
 
-    public_thumbnail_image_url=Column(VARCHAR(255))#オブジェクトストレージ上の公開団体サムネイル画像へのURL
-    public_page_content_url = Column(VARCHAR(255))#オブジェクトストレージ上の団体個別公開ページのMarkdownへのURL
-    private_page_content_url = Column(VARCHAR(255))#オブジェクトストレージ上の団体個別非公開ページのMarkdownへのURL
+    public_thumbnail_image_url = Column(
+        VARCHAR(255)
+    )  # オブジェクトストレージ上の公開団体サムネイル画像へのURL
+    public_page_content_url = Column(
+        VARCHAR(255)
+    )  # オブジェクトストレージ上の団体個別公開ページのMarkdownへのURL
+    private_page_content_url = Column(
+        VARCHAR(255)
+    )  # オブジェクトストレージ上の団体個別非公開ページのMarkdownへのURL
 
-    floor = Column(VARCHAR(255)) #何階か
-    place = Column(VARCHAR(255)) #どこか
+    floor = Column(VARCHAR(255))  # 何階か
+    place = Column(VARCHAR(255))  # どこか
 
-    type = Column(VARCHAR(255)) # クラス劇・Hebe・部活かなどの情報。この情報をもとにフロントが各団体を判別していく
+    type = Column(
+        VARCHAR(255)
+    )  # クラス劇・Hebe・部活かなどの情報。この情報をもとにフロントが各団体を判別していく
 
-    def update_dict(self,dict):
+    def update_dict(self, dict):
         print(dict)
         for name, value in dict.items():
-            if name in self.__dict__ :
+            if name in self.__dict__:
                 setattr(self, name, value)
 
+
 class GroupLink(Base):
     __tablename__ = "grouplinks"
-    id=Column(VARCHAR(255),primary_key=True,index=True,unique=True)#ULID
-    name = Column(VARCHAR(255),nullable=False)
-    group_id = Column(VARCHAR(255),ForeignKey("groups.id"),nullable=False,primary_key=True)
-    linktext = Column(VARCHAR(1023),nullable=False)
-
+    id = Column(VARCHAR(255), primary_key=True, index=True, unique=True)  # ULID
+    name = Column(VARCHAR(255), nullable=False)
+    group_id = Column(
+        VARCHAR(255), ForeignKey("groups.id"), nullable=False, primary_key=True
+    )
+    linktext = Column(VARCHAR(1023), nullable=False)
+
+
 class GroupOwner(Base):
     __tablename__ = "groupowners"
-    group_id=Column(VARCHAR(255), ForeignKey("groups.id"),primary_key=True)
-    user_id=Column(VARCHAR(255),primary_key=True) # sub in jwt (UUID)
-    note=Column(VARCHAR(255)) # note for management use
-    UniqueConstraint('group_id', 'user_id', name="unique_idx_groupid_userid")
+    group_id = Column(VARCHAR(255), ForeignKey("groups.id"), primary_key=True)
+    user_id = Column(VARCHAR(255), primary_key=True)  # sub in jwt (UUID)
+    note = Column(VARCHAR(255))  # note for management use
+    UniqueConstraint("group_id", "user_id", name="unique_idx_groupid_userid")
+
 
 class Ticket(Base):
     __tablename__ = "tickets"
 
-    id=Column(VARCHAR(255),primary_key=True,index=True,unique=True)#ULID
+    id = Column(VARCHAR(255), primary_key=True, index=True, unique=True)  # ULID
     created_at = Column(VARCHAR(255))
 
     group_id = Column(VARCHAR(255), ForeignKey("groups.id"))
     event_id = Column(VARCHAR(255), ForeignKey("events.id"))
-    owner_id = Column(VARCHAR(255))# sub in jwt (UUID)
+    owner_id = Column(VARCHAR(255))  # sub in jwt (UUID)
+
+    person = Column(Integer, default=1)  # 何人分のチケットか
 
-    person = Column(Integer,default=1)#何人分のチケットか
+    is_family_ticket = Column(
+        Boolean, default=False
+    )  # 家族の1枚保証制度で取られたチケットかどうか
+    status = Column(
+        VARCHAR(255),
+        default="active",
+        server_default=text('"active"'),
+        index=True,
+        nullable=False,
+    )  # active,active,cancelled,used,pending,reject
 
-    is_family_ticket = Column(Boolean,default=False)#家族の1枚保証制度で取られたチケットかどうか
-    status = Column(VARCHAR(255),default="active",server_default=text('"active"'),index=True,nullable=False) #active,active,cancelled,used,pending,reject
 
 class HebeNowplaying(Base):
     __tablename__ = "hebenowplaying"
-
-    group_id = Column(VARCHAR(255),ForeignKey("groups.id"),primary_key=True,index=True)
+
+    group_id = Column(
+        VARCHAR(255), ForeignKey("groups.id"), primary_key=True, index=True
+    )
+
+
 class HebeUpnext(Base):
     __tablename__ = "hebeupnext"
-
-    group_id = Column(VARCHAR(255),ForeignKey("groups.id"),primary_key=True,index=True)
+
+    group_id = Column(
+        VARCHAR(255), ForeignKey("groups.id"), primary_key=True, index=True
+    )
+
 
 class News(Base):
     __tablename__ = "news"
@@ -121,7 +176,7 @@ class News(Base):
     author = Column(VARCHAR(255), nullable=False)
     detail = Column(VARCHAR(500), nullable=True)
 
-    def update_dict(self,dict):
+    def update_dict(self, dict):
         for name, value in dict.items():
-            if name in self.__dict__ :
-                setattr(self, name, value)
+            if name in self.__dict__:
+                setattr(self, name, value)
diff --git a/migration/versions/5e583a6e225c_linktextの型をvarcharからtextに変更.py b/migration/versions/5e583a6e225c_linktextの型をvarcharからtextに変更.py
@@ -0,0 +1,36 @@
+"""linktextの型をvarcharからtextに変更
+
+Revision ID: 5e583a6e225c
+Revises: 73277cc08dac
+Create Date: 2024-09-23 14:59:44.935752
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "5e583a6e225c"
+down_revision = "73277cc08dac"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column(
+        "grouplinks", "linktext", existing_type=sa.VARCHAR(255), type_=sa.VARCHAR(1023)
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column(
+        "grouplinks",
+        "linktext",
+        existing_type=sa.VARCHAR(1023),
+        type_=sa.VARCHAR(255),
+    )
+    # ### end Alembic commands ###
File	Stmts	Miss	Cover	Missing
workspace/app
auth.py	337	188	44%	34, 38–39, 47–57, 67, 71, 75–79, 88–89, 94, 100–102, 107, 114–115, 117–120, 128–129, 132–135, 138–144, 146–149, 154, 156, 158, 161–167, 169–172, 175–181, 183–186, 192–194, 196–199, 209, 230–233, 237–240, 244–247, 251–254, 258–261, 265–268, 272–275, 279–282, 286–289, 293–296, 300–303, 307–310, 314–317, 321–324, 335–338, 342–345, 349–352, 356–359, 363–366, 370–373, 377–380, 384–387, 395–398, 403, 408, 410, 413–416, 418, 421–424, 426, 428–431, 433, 435–438, 443, 445, 447, 449, 452–475
blob_storage.py	59	38	36%	35–54, 57–77, 80–85
crud.py	468	163	65%	41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63, 65, 67, 70–87, 93–97, 101–105, 119, 126, 129–130, 144–152, 191, 261–272, 333–351, 373, 377–378, 455–470, 497–509, 513–516, 520–524, 540–552, 556–566, 594–598, 602–603, 612–618, 622–627, 642–645, 718, 722, 726–736, 740–750, 758, 798, 882–883, 982, 986–991, 1007–1012, 1016–1024
db.py	22	11	50%	30–41
ga.py	26	18	31%	16–32, 34–45
main.py	481	194	60%	45, 116, 130, 146, 173–177, 205, 235–238, 253–256, 278–284, 303, 325, 328, 364, 386–397, 415, 417, 444, 446, 449, 473, 477–478, 495, 514, 522, 542, 545, 553, 576–588, 601–615, 629–642, 662–670, 703–714, 741, 743, 756–759, 766–768, 787, 789, 799, 833, 835, 850, 870, 873, 898–905, 921–924, 957–965, 979–987, 1056, 1093, 1138–1141, 1152, 1164–1167, 1184–1187, 1202–1205, 1216, 1234–1238, 1253–1264, 1276–1280, 1290–1294, 1309, 1324, 1334, 1344, 1359, 1375–1378, 1394–1397
models.py	90	3	97%	180–182
msgraph.py	31	19	39%	14, 16–42, 44–47, 50–63
redis_possible.py	21	4	81%	12–13, 21–22
schemas.py	172	1	99%	207
workspace/app/test
conftest.py	19	1	95%	31
TOTAL	2525	640	75%