fix: changes by review

graasp · Mar 16, 2022 · c0bfa0f · c0bfa0f
1 parent 4406cb3
commit c0bfa0f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/src/api/itemValidation.ts b/src/api/itemValidation.ts
@@ -15,7 +15,7 @@ export const getItemValidationStatuses = async ({ API_HOST }: QueryClientConfig)
   export const getItemValidationReviewStatuses = async ({ API_HOST }: QueryClientConfig) =>
   axios.get(`${API_HOST}/${GET_ITEM_VALIDATION_REVIEW_STATUSES_ROUTE}`).then(({ data }) => data);
 
-export const getValidationStatus = async (
+export const getItemValidationAndReviews = async (
   { API_HOST }: QueryClientConfig,
   itemId: UUID,
 ) =>

diff --git a/src/config/keys.ts b/src/config/keys.ts
@@ -150,6 +150,6 @@ export const MUTATION_KEYS = {
   DELETE_ITEM_LIKE: 'deleteItemLike',
   ADD_FAVORITE_ITEM: 'addFavoriteItem',
   DELETE_FAVORITE_ITEM: 'deleteFavoriteItem',
-  POST_VALIDATION: 'postItemValidation',
-  UPDATE_VALIDATION_REVIEW: 'updateItemValidationReview',
+  POST_ITEM_VALIDATION: 'postItemValidation',
+  UPDATE_ITEM_VALIDATION_REVIEW: 'updateItemValidationReview',
 };
diff --git a/src/hooks/itemValidation.ts b/src/hooks/itemValidation.ts
@@ -43,7 +43,7 @@ export default (queryConfig: QueryClientConfig) => {
     useQuery({
       queryKey: buildItemValidationAndReviewsKey(itemId),
       queryFn: () =>
-        Api.getValidationStatus(queryConfig, itemId).then((data) => List(data)),
+        Api.getItemValidationAndReviews(queryConfig, itemId).then((data) => List(data)),
       ...defaultOptions,
       enabled: Boolean(itemId),
     });

diff --git a/src/mutations/itemValidation.test.ts b/src/mutations/itemValidation.test.ts
@@ -30,13 +30,13 @@ describe('Item Validation Mutations', () => {
     nock.cleanAll();
   });
 
-  describe(MUTATION_KEYS.POST_VALIDATION, () => {
+  describe(MUTATION_KEYS.POST_ITEM_VALIDATION, () => {
     const itemId = 'item-id';
     const route = `/${buildPostItemValidationRoute(itemId)}`;
-    const mutation = () => useMutation(MUTATION_KEYS.POST_VALIDATION);
+    const mutation = () => useMutation(MUTATION_KEYS.POST_ITEM_VALIDATION);
     const key = buildItemValidationAndReviewsKey(itemId);
 
-    it('Post validation', async () => {
+    it('Post item validation', async () => {
       queryClient.setQueryData(key, List([ITEM_VALIDATION_STATUS]));
 
       const endpoints = [
@@ -65,7 +65,7 @@ describe('Item Validation Mutations', () => {
         type: postItemValidationRoutine.SUCCESS,
       });
     });
-    it('Unauthorized to post item category', async () => {
+    it('Unauthorized to post item validation', async () => {
       queryClient.setQueryData(key, List([ITEM_VALIDATION_STATUS]));
       const endpoints = [
         {
@@ -95,17 +95,17 @@ describe('Item Validation Mutations', () => {
     });
   });
 
-  describe(MUTATION_KEYS.UPDATE_VALIDATION_REVIEW, () => {
+  describe(MUTATION_KEYS.UPDATE_ITEM_VALIDATION_REVIEW, () => {
     const id = 'id1';
     const itemId = 'item-id';
     const status = 'accepted';
     const reason = '';
     const route = `/${buildUpdateItemValidationReviewRoute(id)}`;
-    const mutation = () => useMutation(MUTATION_KEYS.UPDATE_VALIDATION_REVIEW);
+    const mutation = () => useMutation(MUTATION_KEYS.UPDATE_ITEM_VALIDATION_REVIEW);
     const statusKey = buildItemValidationAndReviewsKey(itemId);
     const reviewsKey = ITEM_VALIDATION_REVIEWS_KEY;
 
-    it('Update validation review record', async () => {
+    it('Update item validation review record', async () => {
       queryClient.setQueryData(statusKey, ITEM_VALIDATION_STATUS);
       queryClient.setQueryData(reviewsKey, FULL_VALIDATION_RECORDS);
 
@@ -143,7 +143,7 @@ describe('Item Validation Mutations', () => {
       );
     });
 
-    it('Unauthorized to update validation review', async () => {
+    it('Unauthorized to update item validation review', async () => {
       queryClient.setQueryData(statusKey, ITEM_VALIDATION_STATUS);
       queryClient.setQueryData(reviewsKey, FULL_VALIDATION_RECORDS);
 

diff --git a/src/mutations/itemValidation.ts b/src/mutations/itemValidation.ts
@@ -15,7 +15,7 @@ export default (queryClient: QueryClient, queryConfig: QueryClientConfig) => {
   const { notifier } = queryConfig;
 
   // payload: itemId
-  queryClient.setMutationDefaults(MUTATION_KEYS.POST_VALIDATION, {
+  queryClient.setMutationDefaults(MUTATION_KEYS.POST_ITEM_VALIDATION, {
     mutationFn: (payload) =>
       Api.postItemValidation(payload, queryConfig).then(() => payload),
     onSuccess: () => {
@@ -35,7 +35,7 @@ export default (queryClient: QueryClient, queryConfig: QueryClientConfig) => {
   });
 
   // payload: id (entry id), itemId, status, reason
-  queryClient.setMutationDefaults(MUTATION_KEYS.UPDATE_VALIDATION_REVIEW, {
+  queryClient.setMutationDefaults(MUTATION_KEYS.UPDATE_ITEM_VALIDATION_REVIEW, {
     mutationFn: (payload) =>
       Api.updateItemValidationReview(payload, queryConfig),
     onSuccess: () => {

diff --git a/src/types.ts b/src/types.ts
@@ -141,6 +141,7 @@ export type GraaspError = {
   data?: unknown;
 };
 
+// a combined record from item-validation, item-validation-review, item-validation-process
 export type FullValidationRecord = {
   id: string;
   itemId: string;