Event from owner can be fetched

Author: jnile

api/reschedule.go

@@ -11,7 +11,6 @@ import (
 	msgraphsdkgo "github.com/microsoftgraph/msgraph-sdk-go"
 	graphmodels "github.com/microsoftgraph/msgraph-sdk-go/models"
 	"github.com/microsoftgraph/msgraph-sdk-go/users"
-	"go.uber.org/zap"
 )
 
 // durationToISO formats a positive duration in the ISO 8601 format.
@@ -231,22 +230,19 @@ func processNewMeetingInfo(ctx context.Context,
 	graph *msgraphsdkgo.GraphServiceClient,
 	s Server,
 	msftMeetingID string,
-	logger zap.SugaredLogger,
 	userEmail string,
 ) (database.Meeting, error) {
 	// Fetch meeting data from microsft
 
-	msftMeeting, err := getUsersEvent(ctx, graph, logger, msftMeetingID, userEmail)
+	msftMeeting, err := getUsersEvent(ctx, graph, msftMeetingID)
 	if err != nil {
-		logger.Error("failed to get meeting data from microsoft", zap.Error(err))
 		return database.Meeting{}, fmt.Errorf("failed to get meeting data from microsoft: %w", err)
 	}
 
 	var startTime time.Time
 	startTime, err = time.Parse(time.RFC3339Nano, *msftMeeting.GetStart().GetDateTime()+"Z")
 	if err != nil {
-		logger.Error("failed to get parse start time", zap.Error(err))
-		return database.Meeting{}, err
+		return database.Meeting{}, fmt.Errorf("failed to get parse start time: %w", err)
 	}
 
 	newMeetingParams := NewMeetingAndPrefsParams{
@@ -257,18 +253,15 @@ func processNewMeetingInfo(ctx context.Context,
 
 	meeting, err := createNewMeetingsAndPrefs(ctx, newMeetingParams, s, msftMeetingID)
 	if err != nil {
-		logger.Error("failed to get data from new db.Meeting", zap.Error(err))
-		return database.Meeting{}, err
+		return database.Meeting{}, fmt.Errorf("failed to get data from new db.Meeting: %w", err)
 	}
 
 	return meeting, nil
 }
 
 func getUsersEvent(ctx context.Context,
 	graph *msgraphsdkgo.GraphServiceClient,
-	logger zap.SugaredLogger,
 	msftID string,
-	userEmail string,
 ) (graphmodels.Eventable, error) {
 	queryFilter := "iCalUId eq '" + msftID + "'"
 
@@ -279,10 +272,8 @@ func getUsersEvent(ctx context.Context,
 		},
 	}
 
-	// msftMeetingRes, err := graph.Me().Events().Get(ctx, &requestConfig)
-	msftMeetingRes, err := graph.Users().ByUserId(userEmail).Events().Get(ctx, &requestConfig)
+	msftMeetingRes, err := graph.Me().Events().Get(ctx, &requestConfig)
 	if err != nil {
-		logger.Error("failed to get meeting data from microsoft", zap.Error(err))
 		return nil, fmt.Errorf("failed to get meeting data from microsoft: %w", err)
 	}
 
@@ -291,6 +282,5 @@ func getUsersEvent(ctx context.Context,
 		return msftMeetingRes.GetValue()[0], nil
 	}
 
-	logger.Error("failed to get meeting data from microsoft: returned empty array")
 	return nil, errors.New("failed to get meeting data from microsoft: returned empty array")
 }

api/rescheduling_impl.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/SlotifyApp/slotify-backend/database"
 	"github.com/avast/retry-go"
+	msgraphsdkgo "github.com/microsoftgraph/msgraph-sdk-go"
 	graphmodels "github.com/microsoftgraph/msgraph-sdk-go/models"
 	"go.uber.org/zap"
 )
@@ -43,9 +44,17 @@ func (s Server) PostAPIRescheduleCheck(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	var graphForOwner *msgraphsdkgo.GraphServiceClient
+	graphForOwner, err = CreateMSFTGraphClient(ctx, s.MSALClient, s.DB, userID)
+	if err != nil {
+		logger.Error("failed to create msgraph client", zap.Error(err))
+		sendError(w, http.StatusBadGateway, "Failed to connect to microsoft graph API")
+		return
+	}
+
 	// Get old meeting data from microsoft
-	msftMeeting, err := getUsersEvent(ctx, graph, *logger,
-		body.OldMeeting.MsftMeetingID, string(body.OldMeeting.OwnerEmail))
+	msftMeeting, err := getUsersEvent(ctx, graphForOwner,
+		body.OldMeeting.MsftMeetingID)
 	if err != nil {
 		logger.Error("failed to get meeting data from microsoft", zap.Error(err))
 		sendError(w, http.StatusBadGateway, "Failed to get meeting data from microsoft")
@@ -132,13 +141,6 @@ func (s Server) PostAPIRescheduleRequestReplace(w http.ResponseWriter, r *http.R
 		return
 	}
 
-	graph, err := CreateMSFTGraphClient(ctx, s.MSALClient, s.DB, userID)
-	if err != nil {
-		logger.Error("failed to create msgraph client", zap.Error(err))
-		sendError(w, http.StatusBadGateway, "Failed to connect to microsoft graph API")
-		return
-	}
-
 	// Check owner exists
 	ownerObj, err := s.DB.GetUserByEmail(ctx, string(body.OldMeeting.OwnerEmail))
 	if err != nil {
@@ -147,6 +149,13 @@ func (s Server) PostAPIRescheduleRequestReplace(w http.ResponseWriter, r *http.R
 		return
 	}
 
+	graph, err := CreateMSFTGraphClient(ctx, s.MSALClient, s.DB, ownerObj.ID)
+	if err != nil {
+		logger.Error("failed to create msgraph client with owner id", zap.Error(err))
+		sendError(w, http.StatusBadGateway, "Failed to connect to microsoft graph API")
+		return
+	}
+
 	// Create Rescheduling Request
 	var requestID int64
 	err = retry.Do(func() error {
@@ -170,7 +179,7 @@ func (s Server) PostAPIRescheduleRequestReplace(w http.ResponseWriter, r *http.R
 	if errors.Is(err, sql.ErrNoRows) {
 		// Meeting info not in db, so create new meeting info
 		meeting, err = processNewMeetingInfo(ctx, graph, s,
-			body.OldMeeting.MsftMeetingID, *logger, string(body.OldMeeting.OwnerEmail))
+			body.OldMeeting.MsftMeetingID, string(body.OldMeeting.OwnerEmail))
 		if err != nil {
 			logger.Error("DB Creation Error: ", zap.Error(err))
 			sendError(w, http.StatusBadGateway, "Failed to create New Meeting Info")
@@ -286,13 +295,6 @@ func (s Server) PostAPIRescheduleRequestSingle(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	graph, err := CreateMSFTGraphClient(ctx, s.MSALClient, s.DB, userID)
-	if err != nil {
-		logger.Error("failed to create msgraph client", zap.Error(err))
-		sendError(w, http.StatusBadGateway, "Failed to connect to microsoft graph API")
-		return
-	}
-
 	// Check owner exists
 	ownerObj, err := s.DB.GetUserByEmail(ctx, string(body.OwnerEmail))
 	if err != nil {
@@ -301,6 +303,13 @@ func (s Server) PostAPIRescheduleRequestSingle(w http.ResponseWriter, r *http.Re
 		return
 	}
 
+	graph, err := CreateMSFTGraphClient(ctx, s.MSALClient, s.DB, ownerObj.ID)
+	if err != nil {
+		logger.Error("failed to create msgraph client", zap.Error(err))
+		sendError(w, http.StatusBadGateway, "Failed to connect to microsoft graph API")
+		return
+	}
+
 	// Create Rescheduling Request
 	var requestID int64
 	err = retry.Do(func() error {
@@ -325,7 +334,7 @@ func (s Server) PostAPIRescheduleRequestSingle(w http.ResponseWriter, r *http.Re
 	meeting, err = s.DB.GetMeetingByMSFTID(ctx, body.MsftMeetingID)
 
 	if errors.Is(err, sql.ErrNoRows) {
-		meeting, err = processNewMeetingInfo(ctx, graph, s, body.MsftMeetingID, *logger, string(body.OwnerEmail))
+		meeting, err = processNewMeetingInfo(ctx, graph, s, body.MsftMeetingID, string(body.OwnerEmail))
 		if err != nil {
 			logger.Error("failed to make new meeting info", zap.Error(err))
 			sendError(w, http.StatusBadGateway, "Failed to make new meeting info")