Skip to content

Commit ff942d0

Browse files
tristanlabelletristanlabelle
committed
Events/i18n: Remove start/end display times from protos
1 parent b6f1610 commit ff942d0

4 files changed

Lines changed: 0 additions & 46 deletions

File tree

‎app/backend/src/couchers/servicers/events.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,6 @@ def event_to_pb(session: Session, occurrence: EventOccurrence, context: Couchers
194194
start_time=Timestamp_from_datetime(occurrence.start_time),
195195
end_time=Timestamp_from_datetime(occurrence.end_time),
196196
timezone=occurrence.timezone,
197-
start_time_display=str(occurrence.start_time),
198-
end_time_display=str(occurrence.end_time),
199197
attendance_state=attendancestate2api[attendance_state],
200198
organizer=event.organizers.where(EventOrganizer.user_id == context.user_id).one_or_none() is not None,
201199
subscriber=event.subscribers.where(EventSubscription.user_id == context.user_id).one_or_none() is not None,

‎app/backend/src/tests/test_events.py‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ def test_CreateEvent(db, push_collector: PushCollector, moderator: Moderator):
9090
assert to_aware_datetime(res.start_time) == start_time
9191
assert to_aware_datetime(res.end_time) == end_time
9292
# assert res.timezone == "UTC"
93-
assert res.start_time_display
94-
assert res.end_time_display
9593
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_GOING
9694
assert res.organizer
9795
assert res.subscriber
@@ -129,8 +127,6 @@ def test_CreateEvent(db, push_collector: PushCollector, moderator: Moderator):
129127
assert to_aware_datetime(res.start_time) == start_time
130128
assert to_aware_datetime(res.end_time) == end_time
131129
# assert res.timezone == "UTC"
132-
assert res.start_time_display
133-
assert res.end_time_display
134130
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
135131
assert not res.organizer
136132
assert not res.subscriber
@@ -163,8 +159,6 @@ def test_CreateEvent(db, push_collector: PushCollector, moderator: Moderator):
163159
assert to_aware_datetime(res.start_time) == start_time
164160
assert to_aware_datetime(res.end_time) == end_time
165161
# assert res.timezone == "UTC"
166-
assert res.start_time_display
167-
assert res.end_time_display
168162
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
169163
assert not res.organizer
170164
assert not res.subscriber
@@ -209,8 +203,6 @@ def test_CreateEvent(db, push_collector: PushCollector, moderator: Moderator):
209203
assert to_aware_datetime(res.start_time) == start_time
210204
assert to_aware_datetime(res.end_time) == end_time
211205
# assert res.timezone == "UTC"
212-
assert res.start_time_display
213-
assert res.end_time_display
214206
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_GOING
215207
assert res.organizer
216208
assert res.subscriber
@@ -246,8 +238,6 @@ def test_CreateEvent(db, push_collector: PushCollector, moderator: Moderator):
246238
assert to_aware_datetime(res.start_time) == start_time
247239
assert to_aware_datetime(res.end_time) == end_time
248240
# assert res.timezone == "UTC"
249-
assert res.start_time_display
250-
assert res.end_time_display
251241
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
252242
assert not res.organizer
253243
assert not res.subscriber
@@ -278,8 +268,6 @@ def test_CreateEvent(db, push_collector: PushCollector, moderator: Moderator):
278268
assert to_aware_datetime(res.start_time) == start_time
279269
assert to_aware_datetime(res.end_time) == end_time
280270
# assert res.timezone == "UTC"
281-
assert res.start_time_display
282-
assert res.end_time_display
283271
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
284272
assert not res.organizer
285273
assert not res.subscriber
@@ -582,8 +570,6 @@ def test_ScheduleEvent(db):
582570
assert to_aware_datetime(res.start_time) == new_start_time
583571
assert to_aware_datetime(res.end_time) == new_end_time
584572
# assert res.timezone == "UTC"
585-
assert res.start_time_display
586-
assert res.end_time_display
587573
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_GOING
588574
assert res.organizer
589575
assert res.subscriber
@@ -785,8 +771,6 @@ def test_UpdateEvent_single(db, moderator: Moderator):
785771
assert to_aware_datetime(res.start_time) == start_time
786772
assert to_aware_datetime(res.end_time) == end_time
787773
# assert res.timezone == "UTC"
788-
assert res.start_time_display
789-
assert res.end_time_display
790774
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_GOING
791775
assert res.organizer
792776
assert res.subscriber
@@ -819,8 +803,6 @@ def test_UpdateEvent_single(db, moderator: Moderator):
819803
assert to_aware_datetime(res.start_time) == start_time
820804
assert to_aware_datetime(res.end_time) == end_time
821805
# assert res.timezone == "UTC"
822-
assert res.start_time_display
823-
assert res.end_time_display
824806
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
825807
assert not res.organizer
826808
assert not res.subscriber
@@ -853,8 +835,6 @@ def test_UpdateEvent_single(db, moderator: Moderator):
853835
assert to_aware_datetime(res.start_time) == start_time
854836
assert to_aware_datetime(res.end_time) == end_time
855837
# assert res.timezone == "UTC"
856-
assert res.start_time_display
857-
assert res.end_time_display
858838
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
859839
assert not res.organizer
860840
assert not res.subscriber
@@ -895,8 +875,6 @@ def test_UpdateEvent_single(db, moderator: Moderator):
895875
assert to_aware_datetime(res.start_time) == start_time
896876
assert to_aware_datetime(res.end_time) == end_time
897877
# assert res.timezone == "UTC"
898-
assert res.start_time_display
899-
assert res.end_time_display
900878
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_GOING
901879
assert res.organizer
902880
assert res.subscriber
@@ -929,8 +907,6 @@ def test_UpdateEvent_single(db, moderator: Moderator):
929907
assert to_aware_datetime(res.start_time) == start_time
930908
assert to_aware_datetime(res.end_time) == end_time
931909
# assert res.timezone == "UTC"
932-
assert res.start_time_display
933-
assert res.end_time_display
934910
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
935911
assert not res.organizer
936912
assert not res.subscriber
@@ -961,8 +937,6 @@ def test_UpdateEvent_single(db, moderator: Moderator):
961937
assert to_aware_datetime(res.start_time) == start_time
962938
assert to_aware_datetime(res.end_time) == end_time
963939
# assert res.timezone == "UTC"
964-
assert res.start_time_display
965-
assert res.end_time_display
966940
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
967941
assert not res.organizer
968942
assert not res.subscriber
@@ -1174,8 +1148,6 @@ def test_GetEvent(db, moderator: Moderator):
11741148
assert to_aware_datetime(res.start_time) == start_time
11751149
assert to_aware_datetime(res.end_time) == end_time
11761150
# assert res.timezone == "UTC"
1177-
assert res.start_time_display
1178-
assert res.end_time_display
11791151
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_GOING
11801152
assert res.organizer
11811153
assert res.subscriber
@@ -1208,8 +1180,6 @@ def test_GetEvent(db, moderator: Moderator):
12081180
assert to_aware_datetime(res.start_time) == start_time
12091181
assert to_aware_datetime(res.end_time) == end_time
12101182
# assert res.timezone == "UTC"
1211-
assert res.start_time_display
1212-
assert res.end_time_display
12131183
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
12141184
assert not res.organizer
12151185
assert not res.subscriber
@@ -1242,8 +1212,6 @@ def test_GetEvent(db, moderator: Moderator):
12421212
assert to_aware_datetime(res.start_time) == start_time
12431213
assert to_aware_datetime(res.end_time) == end_time
12441214
# assert res.timezone == "UTC"
1245-
assert res.start_time_display
1246-
assert res.end_time_display
12471215
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
12481216
assert not res.organizer
12491217
assert not res.subscriber

‎app/proto/events.proto‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,6 @@ message Event {
134134
// the tzdata timezone identifier
135135
string timezone = 18;
136136

137-
// the start/end times as localized strings (according to the above timezone)
138-
string start_time_display = 19;
139-
string end_time_display = 20;
140-
141137
// the user's attendance state
142138
AttendanceState attendance_state = 21;
143139
// whether the current user is a subscriber/organizer to the event

‎app/web/test/fixtures/events.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
"slug": "weekly-meetup",
3333
"startTime": { "nanos": 0, "seconds": 1624934247.732 },
3434
"endTime": { "nanos": 0, "seconds": 1624937847 },
35-
"startTimeDisplay": "",
36-
"endTimeDisplay": "",
3735
"title": "Weekly Meetup",
3836
"timezone": "Europe/Amsterdam"
3937
},
@@ -68,8 +66,6 @@
6866
"slug": "planting-season-meetup",
6967
"startTime": { "nanos": 0, "seconds": 1625000420 },
7068
"endTime": { "nanos": 0, "seconds": 1625004020 },
71-
"startTimeDisplay": "",
72-
"endTimeDisplay": "",
7369
"title": "Planting Season Meetup",
7470
"timezone": "Europe/Amsterdam"
7571
},
@@ -106,8 +102,6 @@
106102
"slug": "cherry-blossom-bike-ride",
107103
"startTime": { "nanos": 0, "seconds": 1625000420 },
108104
"endTime": { "nanos": 0, "seconds": 1625018400 },
109-
"startTimeDisplay": "",
110-
"endTimeDisplay": "",
111105
"title": "Cherry Blossom Bike Ride around the entire Amsterdam because I like to write long event titles",
112106
"timezone": "Europe/Amsterdam"
113107
},
@@ -144,8 +138,6 @@
144138
"slug": "cherry-blossom-bike-ride",
145139
"startTime": { "nanos": 0, "seconds": 1625000420 },
146140
"endTime": { "nanos": 0, "seconds": 1625018400 },
147-
"startTimeDisplay": "",
148-
"endTimeDisplay": "",
149141
"title": "A cancelled event",
150142
"timezone": "Europe/Amsterdam"
151143
}

0 commit comments

Comments
 (0)