Merge branch 'release' into 'master'

Release

See merge request elixxir/notifications-bot!23

.gitlab-ci.yml

@@ -67,12 +67,11 @@ tag:
         - git tag $(./release/notifications.linux64 version | grep "Elixxir Notifications Server v"| cut -d ' ' -f4) -f
         - git push origin_tags -f --tags
 
-trigger_integration:
+trigger-integration:
   stage: trigger_integration
-  script:
-    # Server
-    - "curl -X POST -F token=2a4419808282d0a47c55eee8b9904e -F ref=master https://gitlab.com/api/v4/projects/28/trigger/pipeline"
-    # Client
-    - "curl -X POST -F token=602ad7669e7d6daa61b210a0c4312b -F ref=master https://gitlab.com/api/v4/projects/28/trigger/pipeline"
+  trigger:
+    project: elixxir/integration
+    branch: $CI_COMMIT_REF_NAME
   only:
     - master
+    - release

notifications/notifications.go

@@ -216,6 +216,7 @@ func notifyUser(ephID int64, data []*notifications.Data, apnsClient *apns.ApnsCo
 		u, err := db.GetUserByHash(e.TransmissionRSAHash)
 		if err != nil {
 			jww.ERROR.Printf("Failed to lookup user with tRSA hash %+v: %+v", e.TransmissionRSAHash, err)
+			continue
 		}
 
 		isAPNS := !strings.Contains(u.Token, ":")

storage/databaseImpl.go

@@ -18,7 +18,7 @@ func (impl *DatabaseImpl) GetUser(userId []byte) (*User, error) {
 	u := &User{}
 	err := impl.db.Take(u, "intermediary_id = ?", userId).Error
 	if err != nil {
-		return nil, errors.Errorf("Failed to retrieve user with ID %s: %+v", userId, err)
+		return nil, err
 	}
 	return u, nil
 }
@@ -28,7 +28,7 @@ func (impl *DatabaseImpl) GetUserByHash(transmissionRsaHash []byte) (*User, erro
 	u := &User{}
 	err := impl.db.Take(u, "transmission_rsa_hash = ?", transmissionRsaHash).Error
 	if err != nil {
-		return nil, errors.Errorf("Failed to retrieve user with tRSA hash %s: %+v", transmissionRsaHash, err)
+		return nil, err
 	}
 	return u, nil
 }