[notifications] Fix a bug on the notification registration

PET-EC-Sobral · Oct 9, 2016 · 1751710 · 1751710
1 parent b2c325a
commit 1751710
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/application/controllers/Messages.php b/application/controllers/Messages.php
@@ -294,9 +294,6 @@ function registerNotification($idRoute){
             $this->loadModel();
             $result = $this->messages_model->insertNotificationRegistration($registry);
 
-            if(!$result)//exist conflict registry
-                return $this->makeJsonRespose(["error" => "CONFLICT"], 409);
-
             return $this->makeJsonRespose($registry, 201);
         }else
             return $this->makeJsonRespose($validator->errors, 400);

diff --git a/application/models/Messages_model.php b/application/models/Messages_model.php
@@ -41,10 +41,18 @@ public function insertNotificationRegistration($notificationRegistration){
 		$registry->id_routes = $notificationRegistration->id_routes;
 		$registry->registration_token_firebase = $notificationRegistration->registration_token_firebase;
 
-		$this->db->insert(self::registeredNotificationsTable, $registry);
-
-		if($this->db->affected_rows() < 1)
-			return false;
+		//check if existing entry
+		$search = $this->db->select("email")
+						    ->from(self::registeredNotificationsTable)
+						    ->where("email = '{$registry->email}' AND id_routes = '$notificationRegistration->id_routes'")
+						    ->get()->result();
+
+		if(count($search) < 1)//insert
+			$this->db->insert(self::registeredNotificationsTable, $registry);
+		else{//update only firebase token
+			$this->db->where("email = '{$registry->email}' AND id_routes = '$notificationRegistration->id_routes'");
+			$this->db->update(self::registeredNotificationsTable, array("registration_token_firebase" => $notificationRegistration->registration_token_firebase));
+		}
 
 		return true;