Revize ebfe6347

re #58 client part(especially rebuilt api.js, all fetches, little edits in YourRequests/UpcomingRequests and fixed bugs in calendar and overview (add event, save, post, numbers)

client/src/api.js

@@ +1 @@
+
 const http = 'http://devcz.yoso.fi:8090/ymanager';
 
 // ******************** GET DATA APP getCurrentProfile ********************
 
 export const getCurrentProfile = async () => {
 
-    try {
-    const response = await fetch(
+  let response;
+
+  try {
+    response = await fetch(
       `${http}/users/current/profile`, {
         headers: {
           Authorization: 1
         }
       }
-    );
+    );    
+  } catch (e) {
+    throw 'Server is not available'
+    }
 
-    if (response.ok) {
-        const data = await response.json();
-        return {
-        name: data.firstName + ' ' + data.lastName,
-        role: data.role,
-        id: data.id,
-        holiday: data.vacationCount,
-        sickday: data.sickDayCount
+  if (response.ok) {
+    const data = await response.json();
+
+    return {
+      name: data.firstName + ' ' + data.lastName,
+      role: data.role,
+      id: data.id,
+      holiday: data.vacationCount,
+      sickday: data.sickDayCount,
+      takenSickday: data.takenSickDayCount
     }
-    } else {
-        if(response.status === 400) {
-          throw 'error 400 GET DATA APP (getCurrentProfile)'
-        }
-        else if (response.status === 500) {
-          throw 'error 500 GET DATA APP (getCurrentProfile)'
-        }
-        else {
-          throw 'error GET DATA APP (getCurrentProfile)'
-        }
+  } else {
+      switch (response.status) {
+        case 401:
+          throw new Error('Not authenticated.')
+        case 500:
+          throw new Error('Internal server error.')
+        default:
+          throw new Error(response.statusText)
+      }
     }
-
-} catch (e) {
-  throw 'error catch GET DATA APP (getCurrentProfile)'
-  }
 }
 
 // ******************** LOAD DATA to CALENDAR - EMPLOYEE ********************
 export const getUserCalendar = async (userName, fromDate ) => {
+
+  let response;
+
   try {
-  const response = await fetch(
-    `${http}/user/${userName.id}/calendar?from=${fromDate}&status=ACCEPTED&status=REJECTED`, {
-      headers: {
-        'Accept': 'application/json',
-        Authorization: 6
-      },
-      method: 'GET',
-    }
-  );
+    response = await fetch(
+      `${http}/user/${userName.id}/calendar?from=${fromDate}&status=ACCEPTED&status=REJECTED`, {
+        headers: {
+          'Accept': 'application/json',
+          Authorization: 6
+        },
+        method: 'GET',
+      }
+    );
+  } catch (e) {
+    throw 'Server is not available'
+  }
 
   if (response.ok) {
-  const data = await response.json();
+    const data = await response.json();
   
-  return data.filter(day => {
-    return day.status !== 'PENDING'
-  }).map(day => {
+    return data.filter(day => {
+      return day.status !== 'PENDING'
+    }).map(day => {
 
     const newDate = day.date.split("/").join("-");
 
     return ({
-    title: userName.name,
-    start: newDate,
-    backgroundColor: day.status === 'REJECTED' ? 'red' : 'green'
+      title: userName.name,
+      start: newDate,
+      backgroundColor: day.status === 'REJECTED' ? 'red' : 'green'
     })
   })
-} else {
-    if(response.status === 400) {
-      throw 'error 400 LOADING DATA (CALENDAR, EMPLOYEE)'
-    }
-    else if (response.status === 500) {
-      throw 'error 500 LOADING DATA (CALENDAR, EMPLOYEE)'
-    }
-    else {
-      throw 'error LOADING DATA (CALENDAR, EMPLOYEE)'
+  } else {
+      switch (response.status) {
+        case 400:
+          throw new Error('Bad request. Check query parameters.')
+        case 401:
+          throw new Error('Not authenticated.')
+        case 403:
+          throw new Error('Not authorized.')
+        case 404:
+          throw new Error('User with given ID does not exist.')
+        case 500:
+          throw new Error('Internal server error.')
+        default:
+          throw new Error(response.statusText)
+      }
     }
 }
-} catch (e) {
-  throw 'error catch LOADING DATA (CALENDAR, EMPLOYEE)'
-}
-}
 
 // ******************** LOAD DATA to CALENDAR - EMPLOYER ********************
+
 export const getAdminCalendar = async () => {
-    try {
-    const response = await fetch(
-      'http://devcz.yoso.fi:8090/ymanager/users/requests/vacation?status=ACCEPTED', {
+
+  let response;
+
+  try {
+    response = await fetch(
+      `${http}/users/requests/vacation?status=ACCEPTED`, {
         headers: {
           'Accept': 'application/json',
           Authorization: 1
@@ -95 +110 @@
         method: 'GET',
       }
     );
+  } catch (e) {
+    throw 'Server is not available'
+  }
 
-    if (response.ok) {
+  if (response.ok) {
     const data = await response.json();
     
     return data.map(day => {
@@ -109 +127 @@
       })
     })
   } else {
-      if(response.status === 400) {
-        throw 'error 400 LOADING DATA (CALENDAR, EMPLOYER)'
-      }
-      else if (response.status === 500) {
-        throw 'error 500 LOADING DATA (CALENDAR, EMPLOYER))'
-      }
-      else {
-        throw 'error LOADING DATA (CALENDAR, EMPLOYER)'
+      switch (response.status) {
+        case 400:
+          throw new Error('Bad request. Check query parameters.')
+        case 401:
+          throw new Error('Not authenticated.')
+        case 403:
+          throw new Error('Not authorized.')
+        case 500:
+          throw new Error('Internal server error.')
+        default:
+          throw new Error(response.statusText)
       }
     }
-  } catch (e) {
-    throw 'error catch LOADING DATA (CALENDAR, EMPLOYER)'
-  }
 }
 
 // ******************** ADD EVENT to CALENDAR - EMPLOYEE ********************
+
 export async function addEventApi(dataAddEventEmployee) {
-try {
+  let response;
+
+  try {
   // send accepted request to server
-    const response = await fetch('http://devcz.yoso.fi:8090/ymanager/user/calendar/create', {
+    response = await fetch(`${http}/user/calendar/create`, {
       headers: {
         Authorization: 6,
         'Content-Type': 'application/json',
@@ -137 +158 @@
   // object which is sent to server
   body: JSON.stringify(dataAddEventEmployee),
     });
-    if (response.ok) {
+  } catch (e) {
+    throw 'Server is not available'
+  }
+
+  if (response.ok) {
       
-      const response = await fetch(
-      'http://devcz.yoso.fi:8090/ymanager/users/requests/vacation?status=PENDING', {
-        headers: {
-          Authorization: 1
-        },
-      });
-      const data = await response.json();
+    response = await fetch(
+    `${http}/users/requests/vacation?status=PENDING`, {
+      headers: {
+        Authorization: 1
+      },
+    });
+    const data = await response.json();
       
     return data.map(request => {
       const a = request.date;
@@ -163 +188 @@
     })
 
   } else {
-    
-    if(response.status === 400) {
-      throw 'error 400 ADD EVENT - EMPLOYEE'
-    }
-    else if (response.status === 500) {
-      throw 'error 500 ADD EVENT - EMPLOYEE'
+      switch (response.status) {
+        case 400:
+          throw new Error('Bad request. Check request body.')
+        case 401:
+          throw new Error('Not authenticated.')
+        case 403:
+          throw new Error('Not authorized.')
+        case 500:
+          throw new Error('Internal server error.')
+        default:
+          throw new Error(response.statusText)
+      }    
     }
-    else {
-      throw 'error ADD EVENT - EMPLOYEE'
-    }
-  }
-} catch (e) {
-    throw 'error catch ADD EVENT - EMPLOYEE'
-  }
 }
       
 // ******************** ADD EVENT to CALENDAR - EMPLOYER ********************
+
 export async function addEventApiAdmin(dataAddEventAdmin) {
+  let response;
+
   try {
-    // send accepted request to server
-        const response = await fetch('http://devcz.yoso.fi:8090/ymanager/user/calendar/create', {
-          headers: {
-            Authorization: 1,
-            'Content-Type': 'application/json',
-          },
-          method: 'POST',
+  // send accepted request to server
+    response = await fetch(`${http}/user/calendar/create`, {
+      headers: {
+        Authorization: 1,
+        'Content-Type': 'application/json',
+    },
+      method: 'POST',
     // object which is sent to server
-          body: JSON.stringify(dataAddEventAdmin),
-        });
-        if (response.ok) {
-          return;
-    } else {
-      if(response.status === 400) {
-        throw('error 400 ADD EVENT ADMIN - EMPLOYER')
-     }
-        else if (response.status === 500) {
-           throw ('error 500 ADD EVENT ADMIN - EMPLOYER')
-        }
-        else {
-           throw('error ADD EVENT ADMIN - EMPLOYER')
-        }
-    }
+      body: JSON.stringify(dataAddEventAdmin),
+    });
   } catch (e) {
-      throw('error catch ADD EVENT ADMIN - EMPLOYER')
-    }
+    throw 'Server is not available'
+  }
+
+  if (!response.ok) {
+    switch (response.status) {
+      case 400:
+        throw new Error('Bad request. Check request body.')
+      case 401:
+        throw new Error('Not authenticated.')
+      case 403:
+        throw new Error('Not authorized.')
+      case 500:
+        throw new Error('Internal server error.')
+      default:
+        throw new Error(response.statusText)
+    }    
+  }
 }
 
 // ******************** GET DATA to OVERVIEW - EMPLOYER ********************
+
 export const getUsersOverview = async () => {
+  let response;
+
   try {
-  const response = await fetch (
-     'http://devcz.yoso.fi:8090/ymanager/users', {
+  response = await fetch (
+    `${http}/users`, {
       headers: {
         Authorization: 1          }
     }
   );
+  } catch (e) {
+    throw 'Server is not available'
+  }
   
-if (response.ok) {
+  if (response.ok) {
 
-  const data = await response.json();
-  return data.map(user => {
+    const data = await response.json();
+    return data.map(user => {
 
-     return (
-        {
+     return ({
            name: user.firstName + ' ' + user.lastName,
            id: user.id,
            sickday: user.sickDayCount,
            holiday: user.vacationCount,
+           takenSickday: user.takenSickDayCount,
            role: user.role
         })
-  })
-}  else {
-      if(response.status === 400) {
-        throw 'error 400 GET DATA (OVERVIEW, EMPLOYER)'
-      }
-      else if (response.status === 500) {
-        throw 'error 500 GET DATA (OVERVIEW, EMPLOYER)'
-      }
-      else {
-        throw 'error GET DATA (OVERVIEW, EMPLOYER)'
-        }
-      }
-  } catch (e) {
-      throw 'error catch GET DATA (OVERVIEW, EMPLOYER)'
+    })
+  } else {
+    switch (response.status) {
+      case 400:
+        throw new Error('Bad request. Check query parameters.')
+      case 401:
+        throw new Error('Not authenticated.')
+      case 403:
+        throw new Error('Not authorized.')
+      case 500:
+        throw new Error('Internal server error.')
+      default:
+        throw new Error(response.statusText)
+    }    
   }
 }
 
 // ******************** SAVE DATA to OVERVIEW - EMPLOYER ********************
+
 export async function saveDataOverview(dataOverviewObject) {
+  let response;
+
   try {
     // send accepted request to server
-        const response = await fetch('http://devcz.yoso.fi:8090/ymanager/user/settings', {
+        response = await fetch(`${http}/user/settings`, {
           headers: {
             Authorization: 1,
             'Content-Type': 'application/json',
@@ -264 +302 @@
     // object which is sent to server
           body: JSON.stringify(dataOverviewObject),        
         });
-        console.log(response.status)
-       if (response.status === 400) {
-        throw 'error 400 SAVE DATA (OVERVIEW, EMPLOYER)'
-          }
-      else if (response.status === 500) {
-        throw 'error 500 SAVE DATA (OVERVIEW, EMPLOYER)'
-      }
-      else if (!response.ok) {
-        throw 'error SAVE DATA (OVERVIEW, EMPLOYER)'
-      }
-
   } catch (e) {
-    throw 'error catch SAVE DATA (OVERVIEW, EMPLOYER'
+    throw 'Server is not available'
   }
+
+  if (!response.ok) {
+    switch (response.status) {
+      case 400:
+        throw new Error('Bad request. Check query parameters.')
+      case 401:
+        throw new Error('Not authenticated.')
+      case 403:
+        throw new Error('Not authorized.')
+      case 500:
+        throw new Error('Internal server error.')
+      default:
+        throw new Error(response.statusText)
+    }
+  }    
 }
 
 // ******************** LOAD DATA to SETTING - EMPLOYER ********************
 export const getSettingData = async () =>  {
+  let response;
+
   try {
     const response = await fetch(
-      'http://devcz.yoso.fi:8090/ymanager/settings', {
+      `${http}/settings`, {
         headers: {
           Authorization: 1
         }
       });
-
-      if (response.ok) {
-      const data = await response.json();
-      return {
-        sickday: data.sickDayCount,
-      }
-    } else {
-        if(response.status === 400) {
-          throw 'error 400 LOADING DATA (SETTING, EMPLOYER)'
-        }
-        else if (response.status === 500) {
-           throw 'error 500 LOADING DATA (SETTING, EMPLOYER)'
-        }
-        else {
-           throw 'error LOADING DATA (SETTING, EMPLOYER)'
-        }
-      }
   } catch (e) {
-    throw 'error catch LOADING DATA (SETTING, EMPLOYER)'
+    throw 'Server is not available'
+    }
+
+  if (response.ok) {
+    const data = await response.json();
+    return {
+      sickday: data.sickDayCount,
+    }
+  } else {
+    switch (response.status) {
+      case 500:
+        throw new Error('Internal server error.')
+      default:
+        throw new Error(response.statusText)
+      }            
     }
+
 }
 
 // ******************** SAVE DATA to SETTING - EMPLOYER ********************
 export async function saveDataSetting(dataSettingObject) {
+  let response;
+
   try {
-    const response = await fetch('http://devcz.yoso.fi:8090/ymanager/settings', {
+    response = await fetch(`${http}/settings`, {
       headers: {
-        'Authorization': 6,
+        'Authorization': 1,
         'Content-Type': 'application/json'
       },
       method: 'POST',
       body: JSON.stringify(dataSettingObject),
     });
+  } catch (e) {
+    throw 'Server is not available'
+  }
 
+  if (!response.ok) {
     switch (response.status) {
-      case 200:
-        throw '...'
+      case 401:
+        throw new Error('Not authenticated.')
+      case 403:
+        throw new Error('Not authorized.')
       case 500:
-        throw ''
+        throw new Error('Internal server error.')
       default:
-        throw response.statusText
-
-    }
-
-    if(response.status === 400) {
-      throw 'error 400 SAVE DATA (OVERVIEW, EMPLOYER)'
-    }
-    else if (response.status === 500) {
-      throw 'error 500 SAVE DATA (OVERVIEW, EMPLOYER)'
-    }
-    else if (!response.ok) {
-      throw 'error SAVE DATA (OVERVIEW, EMPLOYER)'
-      }
-  } catch (e) {
-      throw 'error catch SAVE DATA (OVERVIEW, EMPLOYER)'
-    }
+        throw new Error(response.statusText)
+    }    
+  }
 }
 
 // ****************** LOAD DATA to YOUR REQUESTS - EMPLOYEE ******************
 
 export async function loadYourRequests() {
+  let response;
+  
   try {
-    const response = await fetch(
-      'http://devcz.yoso.fi:8090/ymanager/user/6/calendar?from=2020/06/24&status=PENDING', {
+    response = await fetch(
+      `${http}/user/6/calendar?from=2020/06/24&status=PENDING`, {
         headers: {
           Authorization: 6
         },
       }
     );
+  } catch (e) {
+    throw 'Server is not available'
+  }
 
   if (response.ok) {
     const data = await response.json();
     return data;
   } else {
-    if(response.status === 400) {
-      alert('error 400 GET DATA (YOUR REQUEST)')
-   }
-      else if (response.status === 500) {
-         alert ('error 500 GET DATA (YOUR REQUEST)')
-      }
-      else {
-         alert('error GET DATA (YOUR REQUEST)')
-      }
-  }
-} catch (e) {
-  console.log(e)
-  alert('error catch GET DATA (YOUR REQUEST)')
-  }
+      switch (response.status) {
+        case 400:
+          throw new Error('Bad request. Check query parameters.')
+        case 401:
+          throw new Error('Not authenticated.')
+        case 403:
+          throw new Error('Not authorized.')
+        case 500:
+          throw new Error('Internal server error.')
+        default:
+          throw new Error(response.statusText)
+      }    
+    }
 }
 
-// ****************** LOAD DATA - UPCOMING REQUESTS - EMPLOYER ******************
+// ****************** LOAD DATA - UPCOMING REQUESTS - EMPLOYER ****************** //tady
 export async function loadAdminRequests() {
+  let response;
+
   try {
-    const response = await fetch(
-      'http://devcz.yoso.fi:8090/ymanager/users/requests/vacation?status=PENDING', {
+    response = await fetch(
+      `${http}/users/requests/vacation?status=PENDING`, {
         headers: {
           Authorization: 1
         }
       },
     );
-
-     if (response.ok) {
+  } catch (e) {
+    throw 'Server is not available'
+    } 
+  
+  if (response.ok) {
     const data = await response.json();
       return data;
   } else {
-    if(response.status === 400) {
-      alert('error 400 GET DATA (UPCOMING REQUESTS)')
-   }
-      else if (response.status === 500) {
-         alert ('error 500 GET DATA (UPCOMING REQUESTS)')
-      }
-      else {
-         alert('error GET DATA (UPCOMING REQUESTS)')
-      }
+      switch (response.status) {
+        case 400:
+          throw new Error('Bad request. Check query parameters.')
+        case 401:
+          throw new Error('Not authenticated.')
+        case 403:
+          throw new Error('Not authorized.')
+        case 500:
+          throw new Error('Internal server error.')
+        default:
+          throw new Error(response.statusText)
+      }   
     }
-} catch (e) {
-  alert('error catch GET DATA (UPCOMING REQUESTS)')
-  } 
 }
 
 // ************** SEND ACCEPTED DATA - UPCOMING REQUESTS - EMPLOYER **************
+
 export async function sendAcceptedRequest(acceptedRequests) {
+  let response;
+
   try {
-    const response = await fetch('http://devcz.yoso.fi:8090/ymanager/user/requests?type=VACATION', {
+    response = await fetch(`${http}/user/requests?type=VACATION`, {
       headers: {
         Authorization: 1,
         'Content-Type': 'application/json',
@@ -420 +469 @@
       method: 'PUT',
       body: JSON.stringify(acceptedRequests),
     });
-
-    if (response.ok) {
-    return;
-
-    } else {
-      if(response.status === 400) {
-        alert('error 400 SEND ACCEPTED DATA (UPCOMING REQUESTS)')
-     }
-        else if (response.status === 500) {
-           alert ('error 500 SEND ACCEPTED DATA (UPCOMING REQUESTS)')
-        }
-        else {
-           alert('error SEND ACCEPTED DATA (UPCOMING REQUESTS)')
-        }
-    }
   } catch (e) {
-    alert('error catch SEND ACCEPTED DATA (UPCOMING REQUESTS)')
+    throw 'Server is not available'
     }
+
+  if (!response.ok) {
+    switch (response.status) {
+      case 400:
+        throw new Error('Bad request. Check query parameters and request body.')
+      case 401:
+        throw new Error('Not authenticated.')
+      case 403:
+        throw new Error('Not authorized.')
+      case 404:
+        throw new Error('Neither vacation nor authorization request with given ID exists.')
+      case 500:
+        throw new Error('Internal server error.')
+      default:
+        throw new Error(response.statusText)
+    }   
+  }
 }
 
 // ************** SEND REJECTED DATA - UPCOMING REQUESTS - EMPLOYER **************
 
 export async function sendRejectedRequest(rejectedRequest) {
+  let response;
+  
   try {
-    const response = await fetch('http://devcz.yoso.fi:8090/ymanager/user/requests?type=VACATION', {
+    response = await fetch(`${http}/user/requests?type=VACATION`, {
       headers: {
         Authorization: 1,
         'Content-Type': 'application/json',
@@ -452 +505 @@
       method: 'PUT',
       body: JSON.stringify(rejectedRequest),
     });
-
-  if (response.ok) {    
-    return;
-
-  } else {
-    if(response.status === 400) {
-      alert('error 400 SEND REJECTED DATA (UPCOMING REQUESTS)')
-   }
-      else if (response.status === 500) {
-         alert ('error 500 SEND REJECTED DATA (UPCOMING REQUESTS)')
-      }
-      else {
-         alert('error SEND REJECTED DATA (UPCOMING REQUESTS)')
-      }
-  }
-} catch (e) {
-  alert('error catch SEND REJECTED DATA (UPCOMING REQUESTS)')
+  } catch (e) {
+    throw 'Server is not available'
+    }
+  
+  if (!response.ok) {
+    switch (response.status) {
+      case 400:
+        throw new Error('Bad request. Check query parameters and request body.')
+      case 401:
+        throw new Error('Not authenticated.')
+      case 403:
+        throw new Error('Not authorized.')
+      case 404:
+        throw new Error('Neither vacation nor authorization request with given ID exists.')
+      case 500:
+        throw new Error('Internal server error.')
+      default:
+        throw new Error(response.statusText)
+    }    
   }
 }
-
-