Story/vspc 171

vspace/src/main/java/edu/asu/diging/simpleusers/web/admin/UsersUtility.java

@@ -1,7 +1,5 @@
 package edu.asu.diging.simpleusers.web.admin;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 
 import org.springframework.security.core.authority.SimpleGrantedAuthority;

vspace/src/main/java/edu/asu/diging/vspace/core/data/ModuleLinkRepository.java

@@ -1,5 +1,6 @@
 package edu.asu.diging.vspace.core.data;
 
+import java.util.Optional;
 import java.util.List;
 
 import org.javers.spring.annotation.JaversSpringDataAuditable;
@@ -12,6 +13,7 @@
 @Repository
 @JaversSpringDataAuditable
 public interface ModuleLinkRepository extends PagingAndSortingRepository<ModuleLink, String> {
+    Optional<ModuleLink> findByModule_Id(String moduleId);
 
     @Query("select moduleLink from ModuleLink moduleLink where module_id = ?1")
     List<IModuleLink> findModuleLinksByModuleId(String moduleId);

vspace/src/main/java/edu/asu/diging/vspace/core/data/SpaceContentBlockRepository.java

@@ -0,0 +1,13 @@
+package edu.asu.diging.vspace.core.data;
+
+import org.javers.spring.annotation.JaversSpringDataAuditable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import edu.asu.diging.vspace.core.model.impl.SpaceBlock;
+
+@Repository
+@JaversSpringDataAuditable
+public interface SpaceContentBlockRepository extends PagingAndSortingRepository<SpaceBlock, String> {
+
+}

vspace/src/main/java/edu/asu/diging/vspace/core/data/SpaceRepository.java

@@ -24,4 +24,6 @@ public interface SpaceRepository extends PagingAndSortingRepository<Space, Strin
 
     Page<ISpace> findDistinctByNameContainingOrDescriptionContaining(Pageable requestedPage, String name,
             String description);
+
+    List<Space> findByNameLike(String name);
 }

vspace/src/main/java/edu/asu/diging/vspace/core/data/display/SpaceDisplayRepository.java

@@ -7,6 +7,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
+
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
 

vspace/src/main/java/edu/asu/diging/vspace/core/exception/ModuleNotFoundException.java

@@ -1,7 +1,7 @@
 package edu.asu.diging.vspace.core.exception;
 
-import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
 @ResponseStatus(value = HttpStatus.NOT_FOUND, reason = "Module Not Found")
 public class ModuleNotFoundException extends Exception {

vspace/src/main/java/edu/asu/diging/vspace/core/exception/SequenceNotFoundException.java

@@ -1,7 +1,7 @@
 package edu.asu.diging.vspace.core.exception;
 
-import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
 @ResponseStatus(value = HttpStatus.NOT_FOUND, reason = "Module Not Found")
 public class SequenceNotFoundException extends Exception {

vspace/src/main/java/edu/asu/diging/vspace/core/exception/SlideNotFoundException.java

@@ -1,7 +1,7 @@
 package edu.asu.diging.vspace.core.exception;
 
-import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
 @ResponseStatus(value = HttpStatus.NOT_FOUND, reason = "Slide Not Found")
 public class SlideNotFoundException extends Exception {

vspace/src/main/java/edu/asu/diging/vspace/core/exception/SlidesInSequenceNotFoundException.java

@@ -1,7 +1,7 @@
 package edu.asu.diging.vspace.core.exception;
 
-import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
 @ResponseStatus(value = HttpStatus.NOT_FOUND, reason = "Module Not Found")
 public class SlidesInSequenceNotFoundException extends Exception {

vspace/src/main/java/edu/asu/diging/vspace/core/exception/SpaceNotFoundException.java

@@ -1,7 +1,7 @@
 package edu.asu.diging.vspace.core.exception;
 
-import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
 @ResponseStatus(value = HttpStatus.NOT_FOUND, reason = "Space Not Found")
 public class SpaceNotFoundException extends Exception {

vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISpaceBlockFactory.java

@@ -0,0 +1,10 @@
+package edu.asu.diging.vspace.core.factory;
+
+import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.ISpaceBlock;
+
+public interface ISpaceBlockFactory {
+
+    ISpaceBlock createSpaceBlock(ISlide slide, String text, ISpace space);
+}

vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SpaceBlockFactory.java

@@ -0,0 +1,22 @@
+package edu.asu.diging.vspace.core.factory.impl;
+
+import org.springframework.stereotype.Service;
+
+import edu.asu.diging.vspace.core.factory.ISpaceBlockFactory;
+import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.ISpaceBlock;
+import edu.asu.diging.vspace.core.model.impl.SpaceBlock;
+
+@Service
+public class SpaceBlockFactory implements ISpaceBlockFactory {
+
+    @Override
+    public ISpaceBlock createSpaceBlock(ISlide slide, String title, ISpace space) {
+        ISpaceBlock spaceBlock = new SpaceBlock();
+        spaceBlock.setTitle(title);
+        spaceBlock.setSlide(slide);
+        spaceBlock.setSpace(space);
+        return spaceBlock;
+    }
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/ExhibitionModes.java

@@ -1,8 +1,5 @@
 package edu.asu.diging.vspace.core.model;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public enum ExhibitionModes {
 
     ACTIVE(""),

vspace/src/main/java/edu/asu/diging/vspace/core/model/ISpaceBlock.java

@@ -0,0 +1,17 @@
+package edu.asu.diging.vspace.core.model;
+
+public interface ISpaceBlock extends IContentBlock {
+
+    void setTitle(String text);
+
+    String getTitle();
+
+    void setId(String id);
+
+    String getId();
+
+    ISpace getSpace();
+
+    void setSpace(ISpace space);
+
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/ExternalLinkDisplay.java

@@ -1,5 +1,6 @@
 package edu.asu.diging.vspace.core.model.display.impl;
 
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
@@ -12,8 +13,6 @@
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.ExternalLink;
 
-import javax.persistence.Entity;
-
 @Entity
 public class ExternalLinkDisplay extends LinkDisplay implements IExternalLinkDisplay {
 

vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Exhibition.java

@@ -14,8 +14,10 @@
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
+
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Parameter;
+
 import edu.asu.diging.vspace.core.model.ExhibitionModes;
 import edu.asu.diging.vspace.core.model.IContentBlock;
 import edu.asu.diging.vspace.core.model.IExhibition;

vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExhibitionAboutPage.java

@@ -1,7 +1,5 @@
 package edu.asu.diging.vspace.core.model.impl;
 
-import java.util.List;
-
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/SpaceBlock.java

@@ -0,0 +1,37 @@
+package edu.asu.diging.vspace.core.model.impl;
+
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.ISpaceBlock;
+
+@Entity
+public class SpaceBlock extends ContentBlock implements ISpaceBlock {
+    @Lob
+    private String title;
+
+    @ManyToOne(targetEntity = Space.class)
+    private ISpace space;
+
+    @Override
+    public String getTitle() {
+        return title;
+    }
+
+    @Override
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override
+    public ISpace getSpace() {
+        return space;
+    }
+
+    @Override
+    public void setSpace(ISpace space) {
+        this.space = space;
+    }
+}

vspace/src/main/java/edu/asu/diging/vspace/core/services/IContentBlockManager.java

@@ -7,10 +7,14 @@
 import edu.asu.diging.vspace.core.model.IChoiceBlock;
 import edu.asu.diging.vspace.core.model.IContentBlock;
 import edu.asu.diging.vspace.core.model.IImageBlock;
+import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.ISpaceBlock;
 import edu.asu.diging.vspace.core.model.ITextBlock;
 import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.IVideoBlock;
 import edu.asu.diging.vspace.core.model.impl.ContentBlock;
+import edu.asu.diging.vspace.core.model.impl.SpaceBlock;
 import edu.asu.diging.vspace.core.model.impl.TextBlock;
 import edu.asu.diging.vspace.core.services.impl.CreationReturnValue;
 
@@ -57,8 +61,35 @@ IChoiceBlock createChoiceBlock(String slideId, List<String> selectedChoices, Int
             boolean showsAll);
 
     Integer findMaxContentOrder(String slideId);
-
+
+    ISpaceBlock createSpaceBlock(String slideId, String title, Integer contentOrder, ISpace space);
+
+    ISpaceBlock getSpaceBlock(String spaceBlockId);
+
+    void saveSpaceBlock(ISpaceBlock textBlock);
+
+    /**
+     * Delete a space block using an id and also decrease content order by 1 of all
+     * the slide's block which are after this block
+     * 
+     * @param blockId - id of resource to be deleted. If the id is null then the
+     *                functions returns nothing.
+     * @param slideId - id of the slide in which the text block with blockId is
+     *                present.
+     * 
+     */
+    void deleteSpaceBlockById(String blockId, String slideId) throws BlockDoesNotExistException;
+
+    /**
+     * Adjusting the content order of the blocks of slide once it is dragged and
+     * changed position.
+     * 
+     * @param contentBlockList - The list contains the blocks and the updated
+     *                         content order corresponding to each blocks.
+     */
     void updateContentOrder(List<ContentBlock> contentBlockList) throws BlockDoesNotExistException;
 
     void saveVideoBlock(IVideoBlock videoBlock);
+
+
 }

vspace/src/main/java/edu/asu/diging/vspace/core/services/IModuleLinkManager.java

@@ -7,6 +7,7 @@
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.IModuleLinkDisplay;
 
+
 public interface IModuleLinkManager extends ILinkManager<IModuleLink, IModule, IModuleLinkDisplay> {
 
     /**

vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java

@@ -38,4 +38,17 @@ public interface ISpaceManager {
     Iterable<Space> addIncomingLinkInfoToSpaces(Iterable<Space> spaces);
 
     Page<ISpace> findByNameOrDescription(Pageable requestedPage,String searchText);
+
+    List<ISpace> findByName(String name);
+
+    /**
+     * Method to return the requested spaces
+     * 
+     * @param pageNo. if pageNo<1, 1st page is returned, if pageNo>total pages,last
+     *                page is returned
+     * @return list of images in the requested pageNo and requested order.
+     */
+    List<ISpace> getSpaces(int pageNo, String sortedBy, String order);
+
+    List<ISpace> getSpaces(int pageNo);
 }