From 3ae432a0c0f9ad6cf23e1281dfc3dfe9f2fc6808 Mon Sep 17 00:00:00 2001 From: Omri Izhaki Date: Sat, 30 Jan 2021 02:56:40 +0200 Subject: [PATCH 1/8] fix: work with database --- app/database/models.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/app/database/models.py b/app/database/models.py index 9e52a195..19b2adf9 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -2,8 +2,8 @@ from app.config import PSQL_ENVIRONMENT from app.database.database import Base -from sqlalchemy import (DDL, Boolean, Column, DateTime, ForeignKey, Index, - Integer, String, event) +from sqlalchemy import (DDL, Boolean, Column, DateTime, ForeignKey, Index, + func, Integer, String, event) from sqlalchemy.dialects.postgresql import TSVECTOR from sqlalchemy.orm import relationship @@ -37,6 +37,11 @@ class User(Base): events = relationship("UserEvent", back_populates="participants") + speedy_meetings_enabled = Column(Boolean, default=False) + + def has_speedy_meetings_enabled(self) -> bool: + return self.speedy_meetings_enabled + def __repr__(self): return f'' @@ -44,10 +49,14 @@ def __repr__(self): class Event(Base): __tablename__ = "events" + DEFAULT_DURATION = 60 + SHORT_MEETING = 0.75 + id = Column(Integer, primary_key=True, index=True) title = Column(String, nullable=False) start = Column(DateTime, nullable=False) end = Column(DateTime, nullable=False) + default_end = Column(Integer, default=func.get_default_end_time()) content = Column(String) location = Column(String) @@ -57,6 +66,14 @@ class Event(Base): participants = relationship("UserEvent", back_populates="events") + def get_default_end_time(self): + return start + get_event_duration() + + def get_event_duration(self): + if owner.has_speedy_meetings_enabled(): + return DEFAULT_DURATION * SHORT_MEETING + return DEFAULT_DURATION + # PostgreSQL if PSQL_ENVIRONMENT: events_tsv = Column(TSVECTOR) From f7f556c07a13e685d1c9e0b13abb468413af7b42 Mon Sep 17 00:00:00 2001 From: Omri Izhaki Date: Sat, 30 Jan 2021 03:22:41 +0200 Subject: [PATCH 2/8] fix: flake8 --- app/database/models.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/database/models.py b/app/database/models.py index 19b2adf9..da267488 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -2,7 +2,7 @@ from app.config import PSQL_ENVIRONMENT from app.database.database import Base -from sqlalchemy import (DDL, Boolean, Column, DateTime, ForeignKey, Index, +from sqlalchemy import (DDL, Boolean, Column, DateTime, ForeignKey, Index, func, Integer, String, event) from sqlalchemy.dialects.postgresql import TSVECTOR from sqlalchemy.orm import relationship @@ -56,7 +56,7 @@ class Event(Base): title = Column(String, nullable=False) start = Column(DateTime, nullable=False) end = Column(DateTime, nullable=False) - default_end = Column(Integer, default=func.get_default_end_time()) + default_end = Column(Integer, default=func.get_default_end_time) content = Column(String) location = Column(String) @@ -90,7 +90,6 @@ def __repr__(self): class PSQLEnvironmentError(Exception): pass - # PostgreSQL if PSQL_ENVIRONMENT: trigger_snippet = DDL(""" From ca896f4f01b93aad240b70a7118398f805c46150 Mon Sep 17 00:00:00 2001 From: Omri Izhaki Date: Sat, 30 Jan 2021 03:36:16 +0200 Subject: [PATCH 3/8] fix: newfile --- app/database/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/database/models.py b/app/database/models.py index da267488..b09db025 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -56,7 +56,7 @@ class Event(Base): title = Column(String, nullable=False) start = Column(DateTime, nullable=False) end = Column(DateTime, nullable=False) - default_end = Column(Integer, default=func.get_default_end_time) + default_end = Column(Integer, default=func.get_default_end_time()) content = Column(String) location = Column(String) From 6380fe35d9f7b530e2c7aa1f593adde808dd0084 Mon Sep 17 00:00:00 2001 From: Omri Izhaki Date: Sat, 30 Jan 2021 03:41:51 +0200 Subject: [PATCH 4/8] fix: flake8 --- app/database/models.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/database/models.py b/app/database/models.py index b09db025..ac920e8a 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -42,6 +42,7 @@ class User(Base): def has_speedy_meetings_enabled(self) -> bool: return self.speedy_meetings_enabled + def __repr__(self): return f'' @@ -67,7 +68,8 @@ class Event(Base): participants = relationship("UserEvent", back_populates="events") def get_default_end_time(self): - return start + get_event_duration() + return self.start + get_event_duration() + def get_event_duration(self): if owner.has_speedy_meetings_enabled(): From a4fd9279351549f68539f56c987db5c89c8ea46f Mon Sep 17 00:00:00 2001 From: Omri Izhaki Date: Sat, 30 Jan 2021 03:45:15 +0200 Subject: [PATCH 5/8] fix: again --- app/database/models.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/database/models.py b/app/database/models.py index ac920e8a..a1f6ae2d 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -42,7 +42,6 @@ class User(Base): def has_speedy_meetings_enabled(self) -> bool: return self.speedy_meetings_enabled - def __repr__(self): return f'' @@ -67,15 +66,14 @@ class Event(Base): participants = relationship("UserEvent", back_populates="events") - def get_default_end_time(self): - return self.start + get_event_duration() - - def get_event_duration(self): if owner.has_speedy_meetings_enabled(): return DEFAULT_DURATION * SHORT_MEETING return DEFAULT_DURATION + def get_default_end_time(self): + return self.start + get_event_duration() + # PostgreSQL if PSQL_ENVIRONMENT: events_tsv = Column(TSVECTOR) From 8fe713d60df3f9a8f1d8e8b822d77956704b1fbe Mon Sep 17 00:00:00 2001 From: Omri Izhaki Date: Sat, 30 Jan 2021 03:49:20 +0200 Subject: [PATCH 6/8] fix: again2 --- app/database/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/database/models.py b/app/database/models.py index a1f6ae2d..dde97b76 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -67,7 +67,7 @@ class Event(Base): participants = relationship("UserEvent", back_populates="events") def get_event_duration(self): - if owner.has_speedy_meetings_enabled(): + if self.owner.has_speedy_meetings_enabled(): return DEFAULT_DURATION * SHORT_MEETING return DEFAULT_DURATION From 2d04e8e26be0935f0f4d81aef086fb2018c8ad6f Mon Sep 17 00:00:00 2001 From: Omri Izhaki Date: Sat, 30 Jan 2021 03:53:05 +0200 Subject: [PATCH 7/8] fix: again3 --- app/database/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/database/models.py b/app/database/models.py index dde97b76..95ddc7f0 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -68,8 +68,8 @@ class Event(Base): def get_event_duration(self): if self.owner.has_speedy_meetings_enabled(): - return DEFAULT_DURATION * SHORT_MEETING - return DEFAULT_DURATION + return self.DEFAULT_DURATION * self.SHORT_MEETING + return self.DEFAULT_DURATION def get_default_end_time(self): return self.start + get_event_duration() From 519f5f9f4ff4c5b1f245499279a4a3d48c08205f Mon Sep 17 00:00:00 2001 From: Omri Izhaki Date: Sat, 30 Jan 2021 03:57:58 +0200 Subject: [PATCH 8/8] fix: again4 --- app/database/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/database/models.py b/app/database/models.py index 95ddc7f0..746fdd6e 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -72,7 +72,7 @@ def get_event_duration(self): return self.DEFAULT_DURATION def get_default_end_time(self): - return self.start + get_event_duration() + return self.start + self.get_event_duration() # PostgreSQL if PSQL_ENVIRONMENT: @@ -90,6 +90,7 @@ def __repr__(self): class PSQLEnvironmentError(Exception): pass + # PostgreSQL if PSQL_ENVIRONMENT: trigger_snippet = DDL("""