Skip to content

Commit

Permalink
change in survey-unit and paradata
Browse files Browse the repository at this point in the history
  • Loading branch information
HugoBouttes authored Jun 13, 2022
1 parent ce147e8 commit dd89660
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 31 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: 0.0.9-SNAPSHOT
release_name: Release 0.0.9-SNAPSHOT
tag_name: 0.0.10-SNAPSHOT
release_name: Release 0.0.10-SNAPSHOT
draft: false
prerelease: false
docker:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>
<groupId>insee.stage</groupId>
<artifactId>demo</artifactId>
<version>0.0.9-SNAPSHOT</version>
<version>0.0.10-SNAPSHOT</version>
<name>demo</name>
<description>Demo project for Spring Boot</description>
<properties>
Expand Down
19 changes: 1 addition & 18 deletions src/main/java/insee/stage/demo/model/Statedata.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,11 @@ public class Statedata {
private Date date;
private int currentPage;

private JSONObject statedata = new JSONObject();

public Statedata(State state, Date date, int currentPage) {
this.state = state;
this.date = date;
this.currentPage = currentPage;
JSONObject temp = this.statedata;
temp.put("state", state);
temp.put("date", date);
temp.put("currentPage", currentPage);
this.statedata = temp;
}

public State getState() {
Expand All @@ -45,16 +39,5 @@ public int getCurrentPage() {
public void setCurrentPage(int currentPage) {
this.currentPage = currentPage;
}

public JSONObject getStatedata(){
return statedata;
}

public void addStatedata(State state, Date date, int currentPage){
JSONObject temp = this.statedata;
temp.put("state", state);
temp.put("date", date);
temp.put("currentPage", currentPage);
this.statedata = temp;
}

}
10 changes: 0 additions & 10 deletions src/main/java/insee/stage/demo/model/SurveyUnit.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ public class SurveyUnit {
private String id;
@Field(name = "state-data")
private Statedata statedata;
@Field(name = "paradata")
private Paradata paradata;
@Field(name = "data")
private JSONObject data;

Expand All @@ -48,14 +46,6 @@ public void setStatedata(Statedata statedata) {
this.statedata = statedata;
}

public Paradata getParadata() {
return paradata;
}

public void setParadata(Paradata paradata) {
this.paradata = paradata;
}

public JSONObject getData() {
return data;
}
Expand Down

0 comments on commit dd89660

Please sign in to comment.