bug: get timezone from datetime instead of event data (#271)

server/remote/date_time.go

@@ -6,8 +6,6 @@ package remote
 import (
 	"time"
 
-	"google.golang.org/api/calendar/v3"
-
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/utils/tz"
 )
 
@@ -35,15 +33,6 @@ func NewDateTime(t time.Time, timeZone string) *DateTime {
 	}
 }
 
-// NewGoogleDateTime creates a DateTime that is compatible with Google's API.
-func NewGoogleDateTime(dateTime *calendar.EventDateTime) *DateTime {
-	t, _ := time.Parse(time.RFC3339, dateTime.DateTime)
-	return &DateTime{
-		DateTime: t.Format(RFC3339NanoNoTimezone),
-		TimeZone: dateTime.TimeZone,
-	}
-}
-
 // String returns the RFC3339 representation of the provided datetime. UndefinedDatetime if not set.
 func (dt DateTime) String() string {
 	t := dt.Time()

server/remote/gcal/get_default_calendar_view.go

@@ -41,7 +41,7 @@ var responseStatusConversion = map[string]string{
 	GoogleResponseStatusNone:  ResponseNone,
 }
 
-func (c *client) GetDefaultCalendarView(remoteUserID string, start, end time.Time) ([]*remote.Event, error) {
+func (c *client) GetDefaultCalendarView(_ string, start, end time.Time) ([]*remote.Event, error) {
 	service, err := calendar.NewService(context.Background(), option.WithHTTPClient(c.httpClient))
 	if err != nil {
 		return nil, errors.Wrap(err, "gcal GetDefaultCalendarView, error creating service")
@@ -73,14 +73,28 @@ func (c *client) GetDefaultCalendarView(remoteUserID string, start, end time.Tim
 	return result, nil
 }
 
+func convertGCalEventDateTimeToRemoteDateTime(dt *calendar.EventDateTime) *remote.DateTime {
+	t, _ := time.Parse(time.RFC3339, dt.DateTime)
+
+	location := dt.TimeZone
+	if t.Location() != nil {
+		location = t.Location().String()
+	}
+
+	return &remote.DateTime{
+		DateTime: t.Format(remote.RFC3339NanoNoTimezone),
+		TimeZone: location,
+	}
+}
+
 func convertGCalEventToRemoteEvent(event *calendar.Event) *remote.Event {
 	showAs := RemoteEventBusy
 	if event.Transparency == GoogleEventFree {
 		showAs = RemoteEventFree
 	}
 
-	start := remote.NewGoogleDateTime(event.Start)
-	end := remote.NewGoogleDateTime(event.End)
+	start := convertGCalEventDateTimeToRemoteDateTime(event.Start)
+	end := convertGCalEventDateTimeToRemoteDateTime(event.End)
 
 	location := &remote.Location{
 		DisplayName: event.Location,