Update error message

devdanielsun · Feb 3, 2024 · c050426 · c050426
1 parent b3867b0
commit c050426
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/pollor.Server/Controllers/AnswersController.cs b/pollor.Server/Controllers/AnswersController.cs
@@ -28,7 +28,7 @@ public IActionResult GetAllAnswers()
                         .Include(a => a.Votes)
                         .ToList();
                     if (answers.IsNullOrEmpty()) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(answers);
                 }
@@ -49,7 +49,7 @@ public IActionResult GetAnswerById(int id)
                         .Include(a => a.Votes)
                         .FirstOrDefault();
                     if (answer == null) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(answer);
                 }
@@ -70,7 +70,7 @@ public IActionResult AddAnswer(AnswerModel answer)
                     context.SaveChanges();
 
                     if (newAnswer == null) {
-                        return NotFound(newAnswer);
+                        return NotFound(new { message = "No records found" });
                     }
                     return Created("answer/" + newAnswer.Entity.id.ToString(), newAnswer.Entity);
                 }

diff --git a/pollor.Server/Controllers/PollsController.cs b/pollor.Server/Controllers/PollsController.cs
@@ -30,7 +30,7 @@ public IActionResult GetAllPolls()
                             .ThenInclude(a => a.Votes)
                         .ToList();
                     if (polls.IsNullOrEmpty()) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(polls);
                 }
@@ -52,7 +52,7 @@ public IActionResult GetPollById(int id)
                             .ThenInclude(a => a.Votes)
                         .FirstOrDefault();
                     if (poll == null) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(poll);
                 }
@@ -73,7 +73,7 @@ public IActionResult AddPoll(PollModel poll)
                     context.SaveChanges();
 
                     if (newPoll == null) {
-                        return NotFound(newPoll);
+                        return NotFound(new { message = "No records found" });
                     }
                     return Created("poll/" + newPoll.Entity.id.ToString(), newPoll.Entity);
                 }

diff --git a/pollor.Server/Controllers/UsersController.cs b/pollor.Server/Controllers/UsersController.cs
@@ -31,7 +31,7 @@ public IActionResult GetAllUsers()
                                 .ThenInclude(a => a.Votes)
                         .ToList();
                     if (users.IsNullOrEmpty()) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(users);
                 }
@@ -76,7 +76,7 @@ public IActionResult GetCurrentUser()
                         .FirstOrDefault();
                     if (user == null)
                     {
-                        return NotFound("User not found...");
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(user);
                 }
@@ -100,7 +100,7 @@ public IActionResult GetUserById(int id)
                                 .ThenInclude(a => a.Votes)
                         .FirstOrDefault();
                     if (user == null) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(user);
                 }

diff --git a/pollor.Server/Controllers/VotesController.cs b/pollor.Server/Controllers/VotesController.cs
@@ -26,7 +26,7 @@ public IActionResult GetAllVotes()
                 using (var context = new PollorDbContext()) {
                     List<VoteModel>? votes = context.Votes.ToList();
                     if (votes.IsNullOrEmpty()) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(votes);
                 }
@@ -46,7 +46,7 @@ public IActionResult GetVoteById(int id)
                         .Where(v => v.id.Equals(id))
                         .FirstOrDefault();
                     if (vote == null) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(vote);
                 }
@@ -67,7 +67,7 @@ public IActionResult AddVote(VoteModel vote)
                     context.SaveChanges();
 
                     if (newVote == null) {
-                        return NotFound(newVote);
+                        return NotFound(new { message = "No records found" });
                     }
                     return Created("vote/" + newVote.Entity.id.ToString(), newVote.Entity);
                 }

diff --git a/pollor.client/src/app/polls/polls.component.ts b/pollor.client/src/app/polls/polls.component.ts
@@ -30,7 +30,7 @@ export class PollsComponent {
           this.pollsLoaded = true;
         },
         error: (err) => {
-          this.pollLoadingMsg = err.status + ' - ' + err.message;
+          this.pollLoadingMsg = err.status + ' - ' + err.error.message;
           this.pollLoadingColor = "red";
           console.error(err);
           AlertMessage.addErrorAlert(err.error.message);

diff --git a/pollor.client/src/app/user-profile/user-profile.component.ts b/pollor.client/src/app/user-profile/user-profile.component.ts
@@ -56,7 +56,7 @@ export class UserProfileComponent {
           this.userLoaded = true;
         },
         error: (err) => {
-          this.userLoadingMsg = err.status + ' - ' + err.message;
+          this.userLoadingMsg = err.status + ' - ' + err.error.message;
           console.error(err);
           AlertMessage.addErrorAlert(err.error.message);
         },