add role value to new user b00tc4mp#485

juditta99 · Jun 17, 2024 · 9c68718 · 9c68718
1 parent 589bcf5
commit 9c68718
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/staff/judy-grayland/project/api/logic/registerUser.js b/staff/judy-grayland/project/api/logic/registerUser.js
@@ -16,14 +16,21 @@ function registerUser(name, email, password) {
       throw new SystemError(error.message)
     })
     .then((hash) => {
-      return User.create({ name, email, password: hash })
+      return User.find()
         .catch((error) => {
-          if (error.code === 11000) {
-            throw new DuplicityError('user already exists')
-          }
           throw new SystemError(error.message)
         })
-        .then((user) => {})
+        .then((users) => {
+          const role = users.length === 0 ? 'admin' : 'user'
+          return User.create({ name, email, password: hash, role })
+            .catch((error) => {
+              if (error.code === 11000) {
+                throw new DuplicityError('user already exists')
+              }
+              throw new SystemError(error.message)
+            })
+            .then((user) => {})
+        })
     })
 }
 

diff --git a/staff/judy-grayland/project/app/src/pages/EditResource.jsx b/staff/judy-grayland/project/app/src/pages/EditResource.jsx
@@ -42,7 +42,7 @@ function EditResource() {
   const [resourceType, setResourceType] = useState('activity')
   const navigate = useNavigate()
 
-  function handleCreateResourceSuccess() {
+  function handleEditResourceSuccess() {
     navigate('/resources')
   }
 
@@ -70,7 +70,7 @@ function EditResource() {
       logic
         .createResource(data)
         .then(() => {
-          handleCreateResourceSuccess()
+          handleEditResourceSuccess()
         })
         .catch((error) => {
           console.error(error)

diff --git a/staff/judy-grayland/project/app/src/pages/ResourcesList.jsx b/staff/judy-grayland/project/app/src/pages/ResourcesList.jsx
@@ -14,7 +14,7 @@ function ResourcesList() {
     navigate('/resources/new')
   }
 
-  const displayResources = () => {
+  const fetchResources = () => {
     try {
       logic
         .retrieveResources()
@@ -29,7 +29,7 @@ function ResourcesList() {
     }
   }
   useEffect(() => {
-    displayResources()
+    fetchResources()
   }, [])
 
   return (