From 0c7b2e5e55ff628a39c265d0b1dc6562c6b5c273 Mon Sep 17 00:00:00 2001
From: Prashant Ravindra Jadhav <55036442+prjadhav14@users.noreply.github.com>
Date: Mon, 1 Jun 2020 05:59:12 -0700
Subject: [PATCH] Story/vspc 72 (#119)

* [VSPC-72] Adding status to Space

* [VSPC-72] Adding status to Space

* [VSPC-72] Loading only published spaces in the exhibition.

* [VSPC-72] Resolving CodeFactor issues

* [VSPC-72] Trying to fix issues caught by CodeFactor

* [VSPC-72] Fixing indentation for VSpaceElement

* [VSPC-72]Status check on request to load Space

* [VSPC-72] Resolution to the review comments

* [VSPC-72] Code style fix

* [VSPC-72] Fixes for review comments

* [VSPC-72]Resolving conflicts

* [VSPC-72] Fixing indentation and resolving conflicts

* [VSPC-72] Adding comments for null space status check

* [VSPC-72] Updating the URL for status update

* [VSPC 72] JUnit Test cases for space status

* [VSPC-72] JUnit Test Cases for Space status as null, pub and unpublished

* [VSPC-72] Adding published spaces to space layout

* [VSPC-72] UI fixes and JUnit Test Case for Space not found
---
 .../core/aspects/ExhibitionDataAspect.java    |  13 +-
 .../vspace/core/data/SpaceRepository.java     |   3 +
 .../vspace/core/model/IVSpaceElement.java     |  34 +--
 .../vspace/core/model/impl/SpaceStatus.java   |   6 +
 .../vspace/core/model/impl/VSpaceElement.java | 196 ++++++++++--------
 .../vspace/core/services/ISpaceManager.java   |   3 +
 .../core/services/impl/SpaceManager.java      |   8 +
 .../vspace/web/ExhibitionSpaceController.java |  53 +++--
 .../vspace/web/staff/AddSpaceController.java  |   5 +-
 .../staff/UpdateSpaceStatusController.java    |  33 +++
 .../WEB-INF/tiles/skeleton_exhibition2.jsp    |  11 +-
 .../webapp/WEB-INF/views/exhibition/space.jsp |   2 +-
 .../WEB-INF/views/staff/spaces/space.jsp      |  24 ++-
 .../core/services/impl/SpaceManagerTest.java  | 119 +++++++++--
 14 files changed, 360 insertions(+), 150 deletions(-)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/SpaceStatus.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java b/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java
index 5b45a2540..1d9117993 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java
@@ -1,5 +1,7 @@
 package edu.asu.diging.vspace.core.aspects;
 
+import java.util.List;
+
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
@@ -9,6 +11,8 @@
 import org.springframework.ui.Model;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.impl.SpaceStatus;
 import edu.asu.diging.vspace.core.services.IExhibitionManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
 
@@ -35,8 +39,13 @@ public void setExhibition(JoinPoint jp) {
                     if (!((Model) obj).containsAttribute("exhibition")) {
                         ((Model) obj).addAttribute("exhibition", exhibitionManager.getStartExhibition());
                     }
-                    if (!((Model) obj).containsAttribute("allSpaces")) {
-                        ((Model) obj).addAttribute("allSpaces", spaceManager.getAllSpaces());
+                    if (!((Model) obj).containsAttribute("publishedSpaces")) {
+                        List<ISpace> publishedSpaces=spaceManager.getSpacesWithStatus(SpaceStatus.PUBLISHED);
+                        /* (non-Javadoc)
+                         * Added to show spaces with null status and accommodate existing spaces with null space status
+                         */
+                        publishedSpaces.addAll(spaceManager.getSpacesWithStatus(null));
+                        ((Model) obj).addAttribute("publishedSpaces", publishedSpaces);
                     }
                 }
             }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpaceRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpaceRepository.java
index 0a284abb7..929ce67d7 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpaceRepository.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SpaceRepository.java
@@ -7,11 +7,14 @@
 import org.springframework.stereotype.Repository;
 
 import edu.asu.diging.vspace.core.model.impl.Space;
+import edu.asu.diging.vspace.core.model.impl.SpaceStatus;
 
 @Repository
 @JaversSpringDataAuditable
 public interface SpaceRepository extends PagingAndSortingRepository<Space, String> {
     
     List<Space> findTop5ByOrderByCreationDateDesc();
+    
+    List<Space> findAllBySpaceStatus(SpaceStatus spaceStatus);
 
 }
\ No newline at end of file
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IVSpaceElement.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IVSpaceElement.java
index c1f92e940..7bc8fa8ae 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IVSpaceElement.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IVSpaceElement.java
@@ -2,33 +2,39 @@
 
 import java.time.OffsetDateTime;
 
+import edu.asu.diging.vspace.core.model.impl.SpaceStatus;
+
 public interface IVSpaceElement {
 
-	String getId();
+    String getId();
+
+    void setId(String id);
+
+    String getName();
 
-	void setId(String id);
+    void setName(String name);
 
-	String getName();
+    String getDescription();
 
-	void setName(String name);
+    void setDescription(String description);
 
-	String getDescription();
+    String getCreatedBy();
 
-	void setDescription(String description);
+    void setCreatedBy(String createdBy);
 
-	String getCreatedBy();
+    OffsetDateTime getCreationDate();
 
-	void setCreatedBy(String createdBy);
+    void setCreationDate(OffsetDateTime creationDate);
 
-	OffsetDateTime getCreationDate();
+    String getModifiedBy();
 
-	void setCreationDate(OffsetDateTime creationDate);
+    void setModifiedBy(String modifiedBy);
 
-	String getModifiedBy();
+    OffsetDateTime getModificationDate();
 
-	void setModifiedBy(String modifiedBy);
+    void setModificationDate(OffsetDateTime modificationDate);
 
-	OffsetDateTime getModificationDate();
+    SpaceStatus getSpaceStatus();
 
-	void setModificationDate(OffsetDateTime modificationDate);
+    void setSpaceStatus(SpaceStatus status);
 }
\ No newline at end of file
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/SpaceStatus.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/SpaceStatus.java
new file mode 100644
index 000000000..36058686a
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/SpaceStatus.java
@@ -0,0 +1,6 @@
+package edu.asu.diging.vspace.core.model.impl;
+
+public enum SpaceStatus {
+    PUBLISHED,
+    UNPUBLISHED
+}
\ No newline at end of file
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/VSpaceElement.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/VSpaceElement.java
index fb31c5241..c77539628 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/VSpaceElement.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/VSpaceElement.java
@@ -9,96 +9,110 @@
 
 @MappedSuperclass
 public abstract class VSpaceElement implements IVSpaceElement {
+    private String name;
+    @Lob private String description;
+    private String createdBy;
+    private OffsetDateTime creationDate;
+    private String modifiedBy;
+    private OffsetDateTime modificationDate;
+    private SpaceStatus spaceStatus;
 
-	private String name;
-	@Lob private String description;
-	private String createdBy;
-	private OffsetDateTime creationDate;
-	private String modifiedBy;
-	private OffsetDateTime modificationDate;
-	
-	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#getName()
-	 */
-	@Override
-	public String getName() {
-		return name;
-	}
-	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#setName(java.lang.String)
-	 */
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#getDescription()
-	 */
-	@Override
-	public String getDescription() {
-		return description;
-	}
-	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#setDescription(java.lang.String)
-	 */
-	@Override
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#getCreatedBy()
-	 */
-	@Override
-	public String getCreatedBy() {
-		return createdBy;
-	}
-	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#setCreatedBy(java.lang.String)
-	 */
-	@Override
-	public void setCreatedBy(String createdBy) {
-		this.createdBy = createdBy;
-	}
-	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#getCreationDate()
-	 */
-	@Override
-	public OffsetDateTime getCreationDate() {
-		return creationDate;
-	}
-	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#setCreationDate(java.time.OffsetDateTime)
-	 */
-	@Override
-	public void setCreationDate(OffsetDateTime creationDate) {
-		this.creationDate = creationDate;
-	}
-	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#getModifiedBy()
-	 */
-	@Override
-	public String getModifiedBy() {
-		return modifiedBy;
-	}
-	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#setModifiedBy(java.lang.String)
-	 */
-	@Override
-	public void setModifiedBy(String modifiedBy) {
-		this.modifiedBy = modifiedBy;
-	}
-	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#getModificationDate()
-	 */
-	@Override
-	public OffsetDateTime getModificationDate() {
-		return modificationDate;
-	}
-	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#setModificationDate(java.time.OffsetDateTime)
-	 */
-	@Override
-	public void setModificationDate(OffsetDateTime modificationDate) {
-		this.modificationDate = modificationDate;
-	}
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#getName()
+     */
+    @Override
+    public String getName() {
+        return name;
+    }
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#setName(java.lang.String)
+     */
+    @Override
+    public void setName(String name) {
+        this.name = name;
+    }
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#getDescription()
+     */
+    @Override
+    public String getDescription() {
+        return description;
+    }
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#setDescription(java.lang.String)
+     */
+    @Override
+    public void setDescription(String description) {
+        this.description = description;
+    }
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#getCreatedBy()
+     */
+    @Override
+    public String getCreatedBy() {
+        return createdBy;
+    }
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#setCreatedBy(java.lang.String)
+     */
+    @Override
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#getCreationDate()
+     */
+    @Override
+    public OffsetDateTime getCreationDate() {
+        return creationDate;
+    }
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#setCreationDate(java.time.OffsetDateTime)
+     */
+    @Override
+    public void setCreationDate(OffsetDateTime creationDate) {
+        this.creationDate = creationDate;
+    }
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#getModifiedBy()
+     */
+    @Override
+    public String getModifiedBy() {
+        return modifiedBy;
+    }
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#setModifiedBy(java.lang.String)
+     */
+    @Override
+    public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#getModificationDate()
+     */
+    @Override
+    public OffsetDateTime getModificationDate() {
+        return modificationDate;
+    }
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#setModificationDate(java.time.OffsetDateTime)
+     */
+    @Override
+    public void setModificationDate(OffsetDateTime modificationDate) {
+        this.modificationDate = modificationDate;
+    }
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#getSpaceStatus()
+     */
+    @Override
+    public SpaceStatus getSpaceStatus() {
+        return spaceStatus;
+    }
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IVSpaceElement#setSpaceStatus(edu.asu.diging.vspace.core.model.impl.SpaceStatus)
+     */
+    @Override
+    public void setSpaceStatus(SpaceStatus spaceStatus) {
+        this.spaceStatus = spaceStatus;
+    }
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java
index 20d01c648..3ac7daf7b 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java
@@ -5,6 +5,7 @@
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.IVSImage;
+import edu.asu.diging.vspace.core.model.impl.SpaceStatus;
 import edu.asu.diging.vspace.core.services.impl.CreationReturnValue;
 
 public interface ISpaceManager {
@@ -19,5 +20,7 @@ public interface ISpaceManager {
 
     List<ISpace> getAllSpaces();
     
+    List<ISpace> getSpacesWithStatus(SpaceStatus status);
+    
     void deleteSpaceById(String id) throws SpaceDoesNotExistException;
 }
\ No newline at end of file
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java
index 53a092408..b4244ec46 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java
@@ -25,6 +25,7 @@
 import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
 import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
 import edu.asu.diging.vspace.core.model.impl.Space;
+import edu.asu.diging.vspace.core.model.impl.SpaceStatus;
 import edu.asu.diging.vspace.core.model.impl.VSImage;
 import edu.asu.diging.vspace.core.services.IImageService;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
@@ -179,6 +180,13 @@ public List<ISpace> getAllSpaces() {
         return spaces;
     }
 
+    @Override
+    public List<ISpace> getSpacesWithStatus(SpaceStatus status) {
+        List<ISpace> spaces = new ArrayList<>();
+        spaceRepo.findAllBySpaceStatus(status).forEach(s -> spaces.add(s));
+        return spaces;
+    }
+    
     /**
      * Method to delete space based on id
      * 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionSpaceController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionSpaceController.java
index 3ed8c36d8..122461d0d 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionSpaceController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/ExhibitionSpaceController.java
@@ -7,31 +7,42 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.impl.SpaceStatus;
 import edu.asu.diging.vspace.core.services.ILinkManager;
 import edu.asu.diging.vspace.core.services.ISpaceDisplayManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
 
 @Controller
 public class ExhibitionSpaceController {
-	
-	@Autowired
-	private ISpaceManager spaceManager;
-	
-	@Autowired
-	private ISpaceDisplayManager spaceDisplayManager;
-	
-	@Autowired
-	private ILinkManager linkManager;
-	
-	@RequestMapping(value="/exhibit/space/{id}")
-	public String space(@PathVariable("id") String id, Model model) {
-		ISpace space = spaceManager.getSpace(id);
-		model.addAttribute("space", space);
-		model.addAttribute("spaceLinks", linkManager.getSpaceLinkDisplays(id));
-		model.addAttribute("moduleList", linkManager.getModuleLinkDisplays(id));
-		model.addAttribute("display", spaceDisplayManager.getBySpace(space));
-		model.addAttribute("externalLinkList", linkManager.getExternalLinkDisplays(id));
-		
-		return "space";
-	}
+
+    @Autowired
+    private ISpaceManager spaceManager;
+
+    @Autowired
+    private ISpaceDisplayManager spaceDisplayManager;
+
+    @Autowired
+    private ILinkManager linkManager;
+
+    @RequestMapping(value="/exhibit/space/{id}")
+    public String space(@PathVariable("id") String id, Model model) {
+        ISpace space = spaceManager.getSpace(id);
+        /* (non-Javadoc)
+         * Below null check is added to accommodate already existing spaces with null space status
+         */
+        if(space.getSpaceStatus() == null || space.getSpaceStatus().equals(SpaceStatus.PUBLISHED)) {
+            model.addAttribute("space", space);
+            model.addAttribute("spaceLinks", linkManager.getSpaceLinkDisplays(id));
+            model.addAttribute("moduleList", linkManager.getModuleLinkDisplays(id));
+            model.addAttribute("display", spaceDisplayManager.getBySpace(space));
+            model.addAttribute("externalLinkList", linkManager.getExternalLinkDisplays(id));  
+        }
+        else {
+            model.addAttribute("showAlert", true);
+            model.addAttribute("alertType", "danger");
+            model.addAttribute("messageType","invalidSpace");
+            model.addAttribute("message", "Access Denied.");
+        }
+        return "space";
+    }
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpaceController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpaceController.java
index 884e9b02c..a4f3f2b1a 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpaceController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSpaceController.java
@@ -19,6 +19,7 @@
 import edu.asu.diging.vspace.core.factory.ISpaceFactory;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.IVSImage;
+import edu.asu.diging.vspace.core.model.impl.SpaceStatus;
 import edu.asu.diging.vspace.core.services.IImageService;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
 import edu.asu.diging.vspace.core.services.impl.CreationReturnValue;
@@ -51,13 +52,13 @@ public String showAddSpace(Model model) {
     public String addSpace(Model model, @ModelAttribute SpaceForm spaceForm, @RequestParam("file") MultipartFile file,
             Principal principal, @RequestParam(value = "imageId", required=false) String imageId, RedirectAttributes redirectAttrs) throws IOException {
         ISpace space = spaceFactory.createSpace(spaceForm);
+        space.setSpaceStatus(SpaceStatus.UNPUBLISHED);
         byte[] bgImage = null;
         String filename = null;
         if (file != null) {
             bgImage = file.getBytes();
             filename = file.getOriginalFilename();
-        }
-        
+        } 
         CreationReturnValue creationValue = null;
         if(imageId != null && !imageId.isEmpty()) {
             IVSImage image;
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java
new file mode 100644
index 000000000..02be0666f
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/UpdateSpaceStatusController.java
@@ -0,0 +1,33 @@
+package edu.asu.diging.vspace.web.staff;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.impl.SpaceStatus;
+import edu.asu.diging.vspace.core.services.ISpaceManager;
+
+
+@Controller
+public class UpdateSpaceStatusController {
+    @Autowired
+    private ISpaceManager spaceManager;
+    
+    @RequestMapping(value="/staff/space/{spaceId}/status", method=RequestMethod.POST)
+    public String updateStatus(HttpServletRequest request,RedirectAttributes attributes, @PathVariable("spaceId") String spaceId, @RequestParam("statusParam") SpaceStatus status) {
+        ISpace space = spaceManager.getSpace(spaceId);
+        space.setSpaceStatus(status);
+        spaceManager.storeSpace(space, null,null);
+        attributes.addAttribute("alertType", "success");
+        attributes.addAttribute("message", "Status successfully updated!");
+        attributes.addAttribute("showAlert", "true");
+        return "redirect:/staff/space/{spaceId}";
+    }
+}
diff --git a/vspace/src/main/webapp/WEB-INF/tiles/skeleton_exhibition2.jsp b/vspace/src/main/webapp/WEB-INF/tiles/skeleton_exhibition2.jsp
index 540c1ba59..c616eb460 100644
--- a/vspace/src/main/webapp/WEB-INF/tiles/skeleton_exhibition2.jsp
+++ b/vspace/src/main/webapp/WEB-INF/tiles/skeleton_exhibition2.jsp
@@ -73,6 +73,12 @@ body {
 .footerBox, .push {
     height: 75px;
 }
+
+.custom-invalidSpace {
+    text-align: center;
+    position: absolute;
+    top: 106px;
+    width: 100%;
 }
 </style>
 <!-- Custom styles for this template -->
@@ -143,7 +149,7 @@ body {
             </div>
 
             <div class="list-group spaceNav">
-                <c:forEach items="${allSpaces}" var="space">
+                <c:forEach items="${publishedSpaces}" var="space">
                     <a
                         href="<c:url value="/exhibit/space/${space.id}" />"
                         class="list-group-item
@@ -157,7 +163,7 @@ body {
         <main role="main" class="flex-shrink-0"
             style="padding-top: 20px;"> <c:if
             test="${showAlert eq true}">
-            <div id="errorMsg" class="alert alert-${alertType}">
+            <div id="errorMsg" class="alert alert-${alertType} custom-${messageType}">
                 ${message}</div>
         </c:if> <tiles:insertAttribute name="content" />
         <div class="push"></div>
@@ -178,5 +184,4 @@ body {
                     feather.replace()
                 </script>
 </body>
-
 </html>
\ No newline at end of file
diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp
index aaef1a1e0..6fc883e9f 100644
--- a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp
+++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp
@@ -179,7 +179,7 @@ function drawLinks() {
                 </div> -->
                 <div class="list-group spaceNav">
                     <ul>
-                        <c:forEach items="${allSpaces}" var="space">
+                        <c:forEach items="${publishedSpaces}" var="space">
                             <li><a class="dropdown-item"
                                 href="<c:url value="/exhibit/space/${space.id}" />">${space.name}</a>
                         </c:forEach>
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.jsp b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.jsp
index 8b74fa90b..ed559f334 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.jsp
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.jsp
@@ -750,6 +750,24 @@ $( document ).ready(function() {
 	<br>
 	Modified on <span class="date">${space.modificationDate}</span> by ${space.modifiedBy}.
 </div>
+<div style="padding-bottom: 10px;">
+    <c:url value="/staff/space/${space.id}/status" var="postUrl" />
+    <form:form method="POST"
+        action="${postUrl}?${_csrf.parameterName}=${_csrf.token}">
+        <label><h5>Space Status:</h5></label>
+        <select class="form-control" name="statusParam"
+            style="width: 200px; display: inline;">
+            <option id="Published" value="PUBLISHED"
+                <c:if test="${space.spaceStatus=='PUBLISHED'}">selected</c:if>>Published</option>
+            <option id="Unpublished" value="UNPUBLISHED"
+                <c:if test="${space.spaceStatus=='UNPUBLISHED'}">selected</c:if>>Unpublished</option>
+        </select>
+        <p
+            style="display: inline; padding-left: 10px; padding-top: 1000px;">
+            <input class="btn btn-primary" type="submit" value="submit" />
+        </p>
+    </form:form>
+</div>
 <h5>Description:</h5>
 <p style="max-height: 100px; overflow-y: scroll;">
 ${space.description}
@@ -757,7 +775,7 @@ ${space.description}
 
 <c:url value="/staff/space/${space.id}/spacelink?${_csrf.parameterName}=${_csrf.token}" var="postUrl" />
 <form id="createSpaceLinkForm">
-	<div id="createSpaceLinkAlert" class="alert alert-secondary" role="alert" style="cursor: move; width: 250px; height: 400px; display: none; position: absolute; top: 300px; right: 50px; z-index: 999">
+	<div id="createSpaceLinkAlert" class="alert alert-secondary" role="alert" style="cursor: move; width: 250px; height: 400px; display: none; position: absolute; top: 400px; right: 50px; z-index: 999">
 		<div class="row">
 			<div class="col">
 				<h6 class="alert-heading"> <small>Create new Space Link</small></h6>
@@ -841,7 +859,7 @@ ${space.description}
 <form id="createModuleLinkForm">
 	<div id="createModuleLinkAlert" class="alert alert-secondary"
 		role="alert"
-		style="cursor: move; width: 250px; height: 400px; display: none; position: absolute; top: 300px; right: 50px; z-index: 999">
+		style="cursor: move; width: 250px; height: 400px; display: none; position: absolute; top: 400px; right: 50px; z-index: 999">
 		<div class="row">
 			<div class="col">
 				<h6 class="alert-heading">
@@ -932,7 +950,7 @@ ${space.description}
 </form:form>
 
 <form id="createExternalLinkForm">
-	<div id="createExternalLinkAlert" class="alert alert-secondary" role="alert" style="cursor:move; width:250px; height: 400px; display:none; position: absolute; top: 300px; right: 50px; z-index:999">
+	<div id="createExternalLinkAlert" class="alert alert-secondary" role="alert" style="cursor:move; width:250px; height: 400px; display:none; position: absolute; top: 400px; right: 50px; z-index:999">
 		 <h6 class="alert-heading"><small>Create new External Link</small></h6>
 		  <p><small>Please click on the image where you want to place the new external link. Then click "Create External Link".</small></p>
 		  <hr>  
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceManagerTest.java
index 9ef88792b..3408da14a 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceManagerTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SpaceManagerTest.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -28,7 +29,10 @@
 import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
 import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
+import edu.asu.diging.vspace.core.model.impl.Sequence;
+import edu.asu.diging.vspace.core.model.impl.Slide;
 import edu.asu.diging.vspace.core.model.impl.Space;
+import edu.asu.diging.vspace.core.model.impl.SpaceStatus;
 import edu.asu.diging.vspace.core.model.impl.VSImage;
 import edu.asu.diging.vspace.core.services.IImageService;
 import edu.asu.diging.vspace.core.services.impl.model.ImageData;
@@ -37,7 +41,7 @@ public class SpaceManagerTest {
 
     @Mock
     private SpaceRepository spaceRepo;
-    
+
     @Mock
     private SpaceDisplayRepository spaceDisplayRepo;
 
@@ -55,7 +59,7 @@ public class SpaceManagerTest {
 
     @Mock
     private IImageFactory imageFactory;
-    
+
     @Mock
     private IImageService imageService;
 
@@ -64,7 +68,7 @@ public class SpaceManagerTest {
 
     @Mock
     private ISpaceLinkDisplayFactory spaceLinkDisplayFactory;
-    
+
     @Mock
     private ISpaceDisplayFactory spaceDisplayFactory;
 
@@ -73,10 +77,13 @@ public class SpaceManagerTest {
 
     private final String IMG_FILENAME = "img";
     private final String IMG_CONTENT_TYPE = "content/type";
-
+    private String spaceId1, spaceId2;
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        spaceId1 = "SPA000000001";
+        spaceId2 = "SPA000000001";
+
     }
 
     @Test
@@ -108,22 +115,108 @@ public void test_storeSpace_success() throws FileStorageException {
         Mockito.verify(spaceRepo).save(space);
         Mockito.verify(spaceDisplayRepo).save((SpaceDisplay)spaceDisplay);
     }
-    
 
-    
+
+
     @Test(expected = SpaceDoesNotExistException.class)
     public void test_deleteSpaceById_whenIdIsNull() throws SpaceDoesNotExistException {
-       Mockito.doThrow(IllegalArgumentException.class)
+        Mockito.doThrow(IllegalArgumentException.class)
         .when(spaceRepo).deleteById(null);
-       managerToTest.deleteSpaceById(null);
+        managerToTest.deleteSpaceById(null);
     }
-    
+
     @Test(expected = SpaceDoesNotExistException.class)
     public void test_deleteSpaceById_forNonExistentId() throws SpaceDoesNotExistException {
-       String imgId = "imgId";
-       Mockito.doThrow(EmptyResultDataAccessException.class)
+        String imgId = "imgId";
+        Mockito.doThrow(EmptyResultDataAccessException.class)
         .when(spaceRepo).deleteById(imgId);
-       managerToTest.deleteSpaceById(imgId);
+        managerToTest.deleteSpaceById(imgId);
+    }
+
+    @Test
+    public void test_getSpacesWithStatus_whenStatusIsNull() throws SpaceDoesNotExistException{
+        Space space=new Space();
+        space.setId(spaceId1);
+        List<Space> spaceList=new ArrayList<>();
+        spaceList.add(space);
+        Mockito.when(spaceRepo.findAllBySpaceStatus(null)).thenReturn(spaceList);
+        List<ISpace> nullStatusSpaces= managerToTest.getSpacesWithStatus(null);
+        String actualSpaceIdWithNull = nullStatusSpaces.get(0).getId();
+        Assert.assertEquals(spaceId1, actualSpaceIdWithNull);
+    }
+
+    @Test
+    public void test_getSpacesWithStatus_whenStatusAsPublished() throws SpaceDoesNotExistException{
+        Space space=new Space();
+        space.setId(spaceId1);
+        space.setSpaceStatus(SpaceStatus.PUBLISHED);
+        List<Space> spaceList=new ArrayList<>();
+        spaceList.add(space);
+        Mockito.when(spaceRepo.findAllBySpaceStatus(SpaceStatus.PUBLISHED)).thenReturn(spaceList);
+        List<ISpace> spaceWithPublishedStatus= managerToTest.getSpacesWithStatus(SpaceStatus.PUBLISHED);
+        String actualSpaceIdWithPubStatus = spaceWithPublishedStatus.get(0).getId();
+        Assert.assertEquals(spaceId1, actualSpaceIdWithPubStatus);
     }
-    
+
+    @Test
+    public void test_getSpacesWithStatus_whenStatusAsUnPublished() throws SpaceDoesNotExistException{
+        Space space=new Space();
+        space.setId(spaceId1);
+        space.setSpaceStatus(SpaceStatus.UNPUBLISHED);
+        List<Space> spaceList=new ArrayList<>();
+        spaceList.add(space);
+        Mockito.when(spaceRepo.findAllBySpaceStatus(SpaceStatus.UNPUBLISHED)).thenReturn(spaceList);
+        List<ISpace> spaceWithPublishedStatus= managerToTest.getSpacesWithStatus(SpaceStatus.UNPUBLISHED);
+        String actualSpaceIdWithUnPubStatus = spaceWithPublishedStatus.get(0).getId();
+        Assert.assertEquals(spaceId1, actualSpaceIdWithUnPubStatus);
+    }
+
+    @Test
+    public void test_getSpacesWithPublishedStatus_spaceDoesNotExist() throws SpaceDoesNotExistException{
+        Space space=new Space();
+        space.setId(spaceId1);
+        space.setSpaceStatus(SpaceStatus.UNPUBLISHED);
+        Space space2=new Space();
+        space2.setId(spaceId2);
+        List<Space> spaceList=new ArrayList<>();
+        spaceList.add(space);
+        Mockito.when(spaceRepo.findAllBySpaceStatus(SpaceStatus.UNPUBLISHED)).thenReturn(spaceList);
+        Mockito.when(spaceRepo.findAllBySpaceStatus(null)).thenReturn(spaceList);
+        List<ISpace> spaceWithPublishedStatus= managerToTest.getSpacesWithStatus(SpaceStatus.PUBLISHED);
+        Assert.assertTrue(spaceWithPublishedStatus.isEmpty());
+    }
+
+    @Test
+    public void test_getSpacesWithNullStatus_spaceDoesNotExist() throws SpaceDoesNotExistException{
+        Space space=new Space();
+        space.setId(spaceId1);
+        space.setSpaceStatus(SpaceStatus.UNPUBLISHED);
+        Space space2=new Space();
+        space.setId(spaceId2);
+        space.setSpaceStatus(SpaceStatus.PUBLISHED);
+        List<Space> spaceList=new ArrayList<>();
+        spaceList.add(space);
+        spaceList.add(space2);
+        Mockito.when(spaceRepo.findAllBySpaceStatus(SpaceStatus.UNPUBLISHED)).thenReturn(spaceList);
+        Mockito.when(spaceRepo.findAllBySpaceStatus(SpaceStatus.PUBLISHED)).thenReturn(spaceList);
+        List<ISpace> spaceWithNullStatus= managerToTest.getSpacesWithStatus(null);
+        Assert.assertTrue(spaceWithNullStatus.isEmpty());
+    }
+
+    @Test
+    public void test_getSpacesWithUnPublishedStatus_spaceDoesNotExist() throws SpaceDoesNotExistException{
+        Space space=new Space();
+        space.setId(spaceId1);
+        space.setSpaceStatus(SpaceStatus.PUBLISHED);
+        Space space2=new Space();
+        space2.setId(spaceId2);
+        List<Space> spaceList=new ArrayList<>();
+        spaceList.add(space);
+        spaceList.add(space2);
+        Mockito.when(spaceRepo.findAllBySpaceStatus(SpaceStatus.PUBLISHED)).thenReturn(spaceList);
+        Mockito.when(spaceRepo.findAllBySpaceStatus(null)).thenReturn(spaceList);
+        List<ISpace> spaceWithNullStatus= managerToTest.getSpacesWithStatus(SpaceStatus.UNPUBLISHED);
+        Assert.assertTrue(spaceWithNullStatus.isEmpty());
+    }
+
 }