Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
File Repository
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Genesys PGR
File Repository
Commits
b55f11c4
Commit
b55f11c4
authored
Jan 15, 2019
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mapped 1-to-1 RepositoryFolder to ImageGallery
- relationship is now on both sides
parent
822f08c8
Pipeline
#8914
passed with stage
in 2 minutes and 34 seconds
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
3 deletions
+40
-3
file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFolder.java
...va/org/genesys/filerepository/model/RepositoryFolder.java
+23
-3
file-repository-core/src/main/java/org/genesys/filerepository/service/ImageGalleryService.java
...g/genesys/filerepository/service/ImageGalleryService.java
+11
-0
file-repository-core/src/main/java/org/genesys/filerepository/service/impl/ImageGalleryServiceImpl.java
.../filerepository/service/impl/ImageGalleryServiceImpl.java
+6
-0
No files found.
file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFolder.java
View file @
b55f11c4
...
...
@@ -28,6 +28,7 @@ import javax.persistence.JoinColumn;
import
javax.persistence.Lob
;
import
javax.persistence.ManyToOne
;
import
javax.persistence.OneToMany
;
import
javax.persistence.OneToOne
;
import
javax.persistence.PrePersist
;
import
javax.persistence.Table
;
import
javax.persistence.Transient
;
...
...
@@ -84,12 +85,13 @@ public class RepositoryFolder extends UuidModel implements AclAwareModel {
/** List of files in this folder. */
@OneToMany
(
cascade
=
{},
fetch
=
FetchType
.
LAZY
,
mappedBy
=
"folder"
)
// @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
// property = "originalFilename")
// @JsonIdentityReference(alwaysAsId = true)
@JsonIgnore
private
List
<
RepositoryFile
>
files
;
@OneToOne
(
cascade
=
{},
fetch
=
FetchType
.
LAZY
,
optional
=
true
,
mappedBy
=
"folder"
)
@JsonIgnore
private
ImageGallery
gallery
;
/**
* The name of the folder within parent Folder. It is immutable and must not be
* updated.
...
...
@@ -310,6 +312,24 @@ public class RepositoryFolder extends UuidModel implements AclAwareModel {
this
.
files
=
files
;
}
/**
* Gets the gallery.
*
* @return the gallery
*/
public
ImageGallery
getGallery
()
{
return
gallery
;
}
/**
* Sets the gallery.
*
* @param gallery the new gallery
*/
protected
void
setGallery
(
ImageGallery
gallery
)
{
this
.
gallery
=
gallery
;
}
/*
* (non-Javadoc)
* @see org.genesys.blocks.model.VersionedModel#toString()
...
...
file-repository-core/src/main/java/org/genesys/filerepository/service/ImageGalleryService.java
View file @
b55f11c4
...
...
@@ -20,6 +20,7 @@ import java.nio.file.Path;
import
org.genesys.filerepository.InvalidRepositoryPathException
;
import
org.genesys.filerepository.model.ImageGallery
;
import
org.genesys.filerepository.model.RepositoryFolder
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
...
...
@@ -45,6 +46,15 @@ public interface ImageGalleryService {
*/
ImageGallery
loadImageGallery
(
Path
path
)
throws
InvalidRepositoryPathException
;
/**
* Get gallery with the specified folder. Use within existing transactions only.
*
* @param folder The folder holding gallery images
* @return the ImageGallery or <code>null</code> if no gallery exists at the
* specified path.
*/
ImageGallery
getImageGallery
(
RepositoryFolder
folder
);
/**
* Create a gallery at the specified path if it does not exist. Path of the
* gallery must be unique in the repository.
...
...
@@ -120,4 +130,5 @@ public interface ImageGalleryService {
*/
Page
<
ImageGallery
>
listImageGalleries
(
Path
root
,
Pageable
pageable
)
throws
InvalidRepositoryPathException
;
}
file-repository-core/src/main/java/org/genesys/filerepository/service/impl/ImageGalleryServiceImpl.java
View file @
b55f11c4
...
...
@@ -96,6 +96,12 @@ public class ImageGalleryServiceImpl implements ImageGalleryService {
final
ImageGallery
imageGallery
=
imageGalleryPersistence
.
findByFolder
(
repositoryService
.
getFolder
(
path
));
return
deepLoad
(
imageGallery
);
}
@Override
@PostAuthorize
(
"returnObject == null or hasRole('ADMINISTRATOR') or hasPermission(returnObject, 'read')"
)
public
ImageGallery
getImageGallery
(
RepositoryFolder
folder
)
{
return
imageGalleryPersistence
.
findByFolder
(
folder
);
}
/**
* Loads {@link ImageGallery#getImages()} when not null.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment