Fix backend tests

Author: sezanzeb

backend/src/services/rating-service.ts

@@ -108,7 +108,7 @@ export class RatingService implements IRatingService {
       }
     });
 
-    if (existingRating !== null) {
+    if (existingRating) {
       // Update
       return this._ratings.save({
         ...rating,

backend/test/controllers/rating-controller.spec.ts

@@ -37,11 +37,11 @@ describe("RatingController", () => {
     const createdRating = new Rating();
     (createdRating as any).id = 1;
 
-    ratingService.mocks.createRating.mockResolvedValue(createdRating);
+    ratingService.mocks.upsertRating.mockResolvedValue(createdRating);
 
-    const result = await controller.createRating({ data: ratingDTO }, user);
+    const result = await controller.rate({ data: ratingDTO }, user);
 
-    expect(ratingService.mocks.createRating).toBeCalled();
+    expect(ratingService.mocks.upsertRating).toBeCalled();
     expect(result).toBeDefined();
   });
 
@@ -113,7 +113,7 @@ describe("RatingController", () => {
     it("allows requests from User-role users", async () => {
       expect.assertions(2);
 
-      ratingService.mocks.createRating.mockResolvedValue({} as any);
+      ratingService.mocks.upsertRating.mockResolvedValue({} as any);
 
       const response = await fetch(`http://localhost:${port}/api/ratings/rate`, {
         method: "POST",
@@ -125,7 +125,7 @@ describe("RatingController", () => {
       });
 
       expect(response.status).toBe(200);
-      expect(ratingService.mocks.createRating).toHaveBeenCalledWith(
+      expect(ratingService.mocks.upsertRating).toHaveBeenCalledWith(
         expect.objectContaining({
           project: expect.objectContaining({ id: 1 }),
           user: expect.objectContaining({ id: regularUser.id }),
@@ -138,7 +138,7 @@ describe("RatingController", () => {
     it("passes authorization for admin (Root) users", async () => {
       expect.assertions(1);
 
-      ratingService.mocks.createRating.mockResolvedValue({} as any);
+      ratingService.mocks.upsertRating.mockResolvedValue({} as any);
 
       const response = await fetch(`http://localhost:${port}/api/ratings/rate`, {
         method: "POST",

backend/test/services/mock/mock-rating-service.ts

@@ -8,9 +8,8 @@ export const MockRatingService = jest.fn(
   () =>
     new MockedService<IRatingService>({
       bootstrap: jest.fn(),
-      getAllRatings: jest.fn(),
-      createRating: jest.fn(),
-      updateRating: jest.fn(),
+      getUsersRatingsForProject: jest.fn(),
+      upsertRating: jest.fn(),
       getRatingByID: jest.fn(),
       deleteRatingByID: jest.fn(),
       getRatingResults: jest.fn(),

backend/test/services/rating-service.spec.ts

@@ -66,15 +66,15 @@ describe("RatingService", () => {
   });
 
   describe("checkPermission", () => {
-    describe("via createRating", () => {
+    describe("via upsertRating", () => {
       it("throws ForbiddenError when rating is globally disabled", async () => {
         expect.assertions(1);
 
         settingsService.mocks.getSettings.mockResolvedValue(
           { application: { allowRatingProjects: false } } as any
         );
 
-        await expect(ratingService.createRating(mockRating, mockUser)).rejects.toThrow(
+        await expect(ratingService.upsertRating(mockRating, mockUser)).rejects.toThrow(
           ForbiddenError,
         );
       });
@@ -88,7 +88,7 @@ describe("RatingService", () => {
 
         mockProjectsRepo.findOneBy.mockResolvedValue(null);
 
-        await expect(ratingService.createRating(mockRating, mockUser)).rejects.toThrow(
+        await expect(ratingService.upsertRating(mockRating, mockUser)).rejects.toThrow(
           NotFoundError,
         );
       });
@@ -104,7 +104,15 @@ describe("RatingService", () => {
           Object.assign(new Project(), { ...mockProject, allowRating: false }),
         );
 
-        await expect(ratingService.createRating(mockRating, mockUser)).rejects.toThrow(
+        // The backend should not be tricked by an allowRating: true in the payload
+        const payload = {
+          ...mockRating,
+          project: {
+            ...mockRating.project,
+            allowRating: true
+          }
+        }
+        await expect(ratingService.upsertRating(payload, mockUser)).rejects.toThrow(
           ForbiddenError,
         );
       });
@@ -119,7 +127,7 @@ describe("RatingService", () => {
         mockProjectsRepo.findOneBy.mockResolvedValue(mockProject);
         mockTeamsRepo.findOneBy.mockResolvedValue(null);
 
-        await expect(ratingService.createRating(mockRating, mockUser)).rejects.toThrow(
+        await expect(ratingService.upsertRating(mockRating, mockUser)).rejects.toThrow(
           NotFoundError,
         );
       });
@@ -136,7 +144,7 @@ describe("RatingService", () => {
           Object.assign(new Team(), { ...mockTeam, users: ["1", "2", "3"] }),
         );
 
-        await expect(ratingService.createRating(mockRating, mockUser)).rejects.toThrow(
+        await expect(ratingService.upsertRating(mockRating, mockUser)).rejects.toThrow(
           ForbiddenError,
         );
       });
@@ -154,28 +162,12 @@ describe("RatingService", () => {
         const savedRating = Object.assign(new Rating(), { ...mockRating, id: 42 });
         mockRatingsRepo.save.mockResolvedValue(savedRating);
 
-        const result = await ratingService.createRating(mockRating, mockUser);
+        const result = await ratingService.upsertRating(mockRating, mockUser);
 
         expect(result).toBe(savedRating);
         expect(mockRatingsRepo.save).toHaveBeenCalledWith(mockRating);
       });
 
-      it("throws BadRequestError when user has already rated the same project and criteria", async () => {
-        expect.assertions(1);
-
-        settingsService.mocks.getSettings.mockResolvedValue(
-          { application: { allowRatingProjects: true } } as any
-        );
-
-        mockProjectsRepo.findOneBy.mockResolvedValue(mockProject);
-        mockTeamsRepo.findOneBy.mockResolvedValue(mockTeam);
-        mockRatingsRepo.findOne.mockResolvedValue(mockRating);
-
-        await expect(ratingService.createRating(mockRating, mockUser)).rejects.toThrow(
-          BadRequestError,
-        );
-      });
-
       it("is forbidden to impersonate other users", async () => {
         expect.assertions(1);
 
@@ -192,7 +184,7 @@ describe("RatingService", () => {
           id: 1234
         };
 
-        await expect(ratingService.createRating(mockRating, mockUser)).rejects.toThrow(
+        await expect(ratingService.upsertRating(mockRating, mockUser)).rejects.toThrow(
           ForbiddenError,
         );
       });

frontend/src/components/pages/rating-form.tsx

@@ -25,10 +25,16 @@ export const RatingForm = ({
   const loginState = useLoginContext();
   const { user } = loginState;
 
-  const [ratingValue, setRatingValue] = useState(rating.rating);
+  const [ratingValue, setRatingValue] = useState(rating?.rating);
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
+  React.useEffect(() => {
+    if (rating) {
+      setRatingValue(rating.rating);
+    }
+  }, [rating]);
+
   const handleSubmit = async () => {
     setIsSubmitting(true);
     setError(null);