Skip to content

Commit 7f5475c

Browse files
TimotheeHrlTimotheeHrl
committed
Lut 26831 : simplify get response from backup
1 parent f50fd96 commit 7f5475c

File tree

5 files changed

+59
-115
lines changed

5 files changed

+59
-115
lines changed

‎src/java/fr/paris/lutece/plugins/forms/service/FormService.java

+18-40
Original file line numberDiff line numberDiff line change
@@ -33,51 +33,18 @@
3333
*/
3434
package fr.paris.lutece.plugins.forms.service;
3535

36-
import java.util.List;
37-
import java.util.stream.Collectors;
38-
39-
import javax.inject.Inject;
40-
import javax.servlet.http.HttpServletRequest;
41-
42-
import org.apache.commons.collections.CollectionUtils;
43-
import org.springframework.transaction.annotation.Transactional;
44-
4536
import fr.paris.lutece.api.user.User;
46-
import fr.paris.lutece.plugins.forms.business.Form;
47-
import fr.paris.lutece.plugins.forms.business.FormDisplay;
48-
import fr.paris.lutece.plugins.forms.business.FormHome;
49-
import fr.paris.lutece.plugins.forms.business.FormMessageHome;
50-
import fr.paris.lutece.plugins.forms.business.FormQuestionResponse;
51-
import fr.paris.lutece.plugins.forms.business.FormQuestionResponseHome;
52-
import fr.paris.lutece.plugins.forms.business.FormResponse;
53-
import fr.paris.lutece.plugins.forms.business.FormResponseHome;
54-
import fr.paris.lutece.plugins.forms.business.FormResponseStep;
55-
import fr.paris.lutece.plugins.forms.business.FormResponseStepHome;
56-
import fr.paris.lutece.plugins.forms.business.Question;
57-
import fr.paris.lutece.plugins.forms.business.Step;
58-
import fr.paris.lutece.plugins.forms.business.StepHome;
37+
import fr.paris.lutece.plugins.forms.business.*;
5938
import fr.paris.lutece.plugins.forms.business.export.FormExportConfigHome;
6039
import fr.paris.lutece.plugins.forms.exception.MaxFormResponseException;
6140
import fr.paris.lutece.plugins.forms.service.workflow.IFormWorkflowService;
6241
import fr.paris.lutece.plugins.forms.util.FormsConstants;
6342
import fr.paris.lutece.plugins.forms.util.FormsResponseUtils;
64-
import fr.paris.lutece.plugins.forms.web.CompositeGroupDisplay;
65-
import fr.paris.lutece.plugins.forms.web.CompositeQuestionDisplay;
66-
import fr.paris.lutece.plugins.forms.web.FormResponseManager;
67-
import fr.paris.lutece.plugins.forms.web.ICompositeDisplay;
68-
import fr.paris.lutece.plugins.forms.web.StepDisplayTree;
43+
import fr.paris.lutece.plugins.forms.web.*;
6944
import fr.paris.lutece.plugins.forms.web.admin.MultiviewFormResponseDetailsJspBean;
7045
import fr.paris.lutece.plugins.forms.web.entrytype.IEntryDataService;
71-
import fr.paris.lutece.plugins.genericattributes.business.Entry;
72-
import fr.paris.lutece.plugins.genericattributes.business.EntryHome;
73-
import fr.paris.lutece.plugins.genericattributes.business.FieldHome;
74-
import fr.paris.lutece.plugins.genericattributes.business.Response;
75-
import fr.paris.lutece.plugins.genericattributes.business.ResponseHome;
76-
import fr.paris.lutece.plugins.genericattributes.service.entrytype.AbstractEntryTypeFile;
77-
import fr.paris.lutece.plugins.genericattributes.service.entrytype.AbstractEntryTypeGalleryImage;
78-
import fr.paris.lutece.plugins.genericattributes.service.entrytype.AbstractEntryTypeImage;
79-
import fr.paris.lutece.plugins.genericattributes.service.entrytype.EntryTypeServiceManager;
80-
import fr.paris.lutece.plugins.genericattributes.service.entrytype.IEntryTypeService;
46+
import fr.paris.lutece.plugins.genericattributes.business.*;
47+
import fr.paris.lutece.plugins.genericattributes.service.entrytype.*;
8148
import fr.paris.lutece.plugins.genericattributes.util.GenericAttributesUtils;
8249
import fr.paris.lutece.portal.business.event.ResourceEvent;
8350
import fr.paris.lutece.portal.business.file.FileHome;
@@ -88,6 +55,13 @@
8855
import fr.paris.lutece.portal.service.spring.SpringContextService;
8956
import fr.paris.lutece.portal.service.workgroup.AdminWorkgroupService;
9057
import fr.paris.lutece.util.sql.TransactionManager;
58+
import org.apache.commons.collections.CollectionUtils;
59+
import org.springframework.transaction.annotation.Transactional;
60+
61+
import javax.inject.Inject;
62+
import javax.servlet.http.HttpServletRequest;
63+
import java.util.List;
64+
import java.util.stream.Collectors;
9165

9266
/**
9367
* This is the service class related to the form
@@ -465,16 +439,20 @@ private boolean canUserAccessFile( HttpServletRequest request, int nIdForm )
465439
* The form
466440
* @param strUserGuid
467441
* The user guid
442+
* @param formResponseManager
443+
*
468444
* @return the created {@code FormResponseManager} object
469445
*/
470-
public FormResponseManager createFormResponseManagerFromBackUp( Form form, String strUserGuid )
446+
public FormResponseManager createFormResponseManagerFromBackUp( Form form, String strUserGuid, FormResponseManager formResponseManager )
471447
{
472-
FormResponseManager formResponseManager = null;
473448
List<FormResponse> listFormResponse = FormResponseHome.getFormResponseByGuidAndForm( strUserGuid, form.getId( ), true );
474449
if ( CollectionUtils.isNotEmpty( listFormResponse ) )
475450
{
476451
formResponseManager = new FormResponseManager( listFormResponse.get( 0 ) );
477-
formResponseManager.setIsResponseLoadedFromBackup(true);
452+
}
453+
else if ( formResponseManager != null && CollectionUtils.isEmpty( listFormResponse ) )
454+
{
455+
return formResponseManager;
478456
}
479457
else
480458
{

‎src/java/fr/paris/lutece/plugins/forms/util/FormsConstants.java

+2
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,8 @@ public final class FormsConstants
251251
public static final String SEPARATOR_UNDERSCORE = "_";
252252
public static final String SEPARATOR_SEMICOLON = ";";
253253
public static final String END_OF_LINE = "\n";
254+
public static final String FO_LOGIN_PAGE_PARAMETERS = "forms.frontOffice.loginPage.parameters";
255+
254256

255257

256258
/**

‎src/java/fr/paris/lutece/plugins/forms/web/FormResponseManager.java

+7-33
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@
3333
*/
3434
package fr.paris.lutece.plugins.forms.web;
3535

36-
import java.sql.Timestamp;
37-
import java.time.LocalDateTime;
38-
import java.util.*;
39-
import java.util.stream.Collectors;
4036
import fr.paris.lutece.plugins.forms.business.*;
41-
import fr.paris.lutece.portal.service.util.AppLogService;
42-
import org.apache.commons.collections.CollectionUtils;
43-
4437
import fr.paris.lutece.plugins.forms.service.EntryServiceManager;
4538
import fr.paris.lutece.plugins.forms.util.FormsConstants;
4639
import fr.paris.lutece.plugins.forms.validation.IValidator;
4740
import fr.paris.lutece.plugins.genericattributes.business.GenericAttributeError;
41+
import fr.paris.lutece.portal.service.util.AppLogService;
42+
import org.apache.commons.collections.CollectionUtils;
43+
44+
import java.sql.Timestamp;
45+
import java.util.ArrayList;
46+
import java.util.List;
47+
import java.util.stream.Collectors;
4848

4949
/**
5050
*
@@ -55,8 +55,6 @@ public class FormResponseManager
5555
{
5656
private final List<Step> _listValidatedStep;
5757
private final FormResponse _formResponse;
58-
private boolean _bIsResponseLoadedFromBackup = false;
59-
private boolean _isBackupResponseAlreadyInitiated = false;
6058
/**
6159
* Constructor
6260
*
@@ -153,35 +151,11 @@ public Timestamp getFormResponseUpdateDate()
153151
}
154152
return updateDate;
155153
}
156-
157154
public void setFormResponseUpdateDate(Timestamp updateDate)
158155
{
159156
FormResponse formResponse = getFormResponse();
160157
formResponse.setUpdate(updateDate);
161158
}
162-
/**
163-
* Give a boolean indicating that indicates if view (getViewStep) has been initialized from backup
164-
* So with _isBackupResponseAlreadyInitiated and _bIsResponseLoadedFromBackup we can deduce if it's the first time the getViewStep is loaded with the backup response
165-
*
166-
* @return a boolean indicating that indicates if view has been initialized from backup
167-
*/
168-
public Boolean getIsBackupResponseAlreadyInitiated() {
169-
return _isBackupResponseAlreadyInitiated;
170-
}
171-
public void setBackupResponseAlreadyInitiated(Boolean isBackupResponseAlreadyInitiated) {
172-
_isBackupResponseAlreadyInitiated = isBackupResponseAlreadyInitiated;
173-
}
174-
/**
175-
* Gives a boolean indicating if the response is loaded from backup
176-
*
177-
* @return a boolean indicating if the response is loaded from backup
178-
*/
179-
public Boolean getIsResponseLoadedFromBackup () {
180-
return _bIsResponseLoadedFromBackup;
181-
}
182-
public void setIsResponseLoadedFromBackup (Boolean bIsResponseLoadedFromBackup) {
183-
_bIsResponseLoadedFromBackup = bIsResponseLoadedFromBackup;
184-
}
185159

186160
/**
187161
* Initializes the steps order

0 commit comments

Comments
 (0)