removed another instance of boilerplate

TUM-Dev · Oct 22, 2023 · 852d066 · 852d066
1 parent 8da5334
commit 852d066
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/server/backend/ios_notifications/apns/repository.go b/server/backend/ios_notifications/apns/repository.go
@@ -53,15 +53,7 @@ func (r *Repository) CreateRequest(deviceId string, requestType model.IOSBackgro
 	return &request, nil
 }
 
-func (r *Repository) SendAlertNotification(payload *model.IOSNotificationPayload) (*model.IOSRemoteNotificationResponse, error) {
-	return r.SendNotification(payload, model.IOSAPNSPushTypeAlert, 10)
-}
-
-func (r *Repository) SendBackgroundNotification(payload *model.IOSNotificationPayload) (*model.IOSRemoteNotificationResponse, error) {
-	return r.SendNotification(payload, model.IOSAPNSPushTypeBackground, 10)
-}
-
-func (r *Repository) SendNotification(notification *model.IOSNotificationPayload, apnsPushType model.IOSAPNSPushType, priority int) (*model.IOSRemoteNotificationResponse, error) {
+func (r *Repository) SendNotification(notification *model.IOSNotificationPayload, apnsPushType model.IOSAPNSPushType) (*model.IOSRemoteNotificationResponse, error) {
 	body, _ := notification.MarshalJSON()
 
 	req, _ := http.NewRequest(http.MethodPost, r.ApnsUrl(notification.DeviceId), bytes.NewBuffer(body))
@@ -70,7 +62,7 @@ func (r *Repository) SendNotification(notification *model.IOSNotificationPayload
 	req.Header.Set("apns-push-type", apnsPushType.String())
 	req.Header.Set("apns-topic", "de.tum.tca")
 	// can be a value between 1 and 10
-	req.Header.Set("apns-priority", strconv.Itoa(priority))
+	req.Header.Set("apns-priority", strconv.Itoa(10))
 
 	bearer := r.Token.GenerateNewTokenIfExpired()
 	req.Header.Set("authorization", "bearer "+bearer)
@@ -87,7 +79,7 @@ func (r *Repository) SendNotification(notification *model.IOSNotificationPayload
 	}(resp.Body)
 
 	var response model.IOSRemoteNotificationResponse
-	if err = json.NewDecoder(resp.Body).Decode(&response); err != nil && err != io.EOF {
+	if err := json.NewDecoder(resp.Body).Decode(&response); err != nil && err != io.EOF {
 		log.WithError(err).Error("Could not decode APNs response")
 		return nil, errors.New("could not decode apns response")
 	}

diff --git a/server/backend/ios_notifications/apns/service.go b/server/backend/ios_notifications/apns/service.go
@@ -33,7 +33,7 @@ func (s *Service) RequestGradeUpdateForDevice(deviceID string) error {
 
 	notification := model.NewIOSNotificationPayload(deviceID).Background(campusRequestToken.RequestID, model.IOSBackgroundCampusTokenRequest)
 
-	if _, err := s.Repository.SendBackgroundNotification(notification); err != nil {
+	if _, err := s.Repository.SendNotification(notification, model.IOSAPNSPushTypeBackground); err != nil {
 		log.WithError(err).Error("Could not send background notification")
 		return errors.New("could not send notification")
 	}

diff --git a/server/backend/ios_notifications/request_response/service.go b/server/backend/ios_notifications/request_response/service.go
@@ -202,8 +202,7 @@ func sendGradesToDevice(device *model.IOSDevice, grades []model.IOSGrade, apns *
 
 	log.WithField("DeviceID", device.DeviceID).Info("Sending push notification")
 
-	_, err := apns.SendAlertNotification(notificationPayload)
-	if err != nil {
+	if _, err := apns.SendNotification(notificationPayload, model.IOSAPNSPushTypeAlert); err != nil {
 		log.WithField("DeviceID", device.DeviceID).WithError(err).Error("Could not send notification")
 	}
 }