new voucher system + jdoc
This commit is contained in:
+32
-28
@@ -43,8 +43,7 @@ import de.bstly.we.businesslogic.SystemPropertyManager;
|
||||
import de.bstly.we.businesslogic.support.InstantHelper;
|
||||
|
||||
/**
|
||||
* @author _bastler@bstly.de
|
||||
*
|
||||
* The Class MembershipManager.
|
||||
*/
|
||||
@Component
|
||||
public class MembershipManager {
|
||||
@@ -58,7 +57,7 @@ public class MembershipManager {
|
||||
private DateFormat pretixDateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
||||
|
||||
/**
|
||||
*
|
||||
* Generate membership ids.
|
||||
*/
|
||||
public void generateMembershipIds() {
|
||||
String membershipItemId = systemPropertyManager
|
||||
@@ -194,7 +193,7 @@ public class MembershipManager {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* Active memberships.
|
||||
*/
|
||||
public void activeMemberships() {
|
||||
|
||||
@@ -319,7 +318,7 @@ public class MembershipManager {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* Creates the membership extension.
|
||||
*/
|
||||
public void createMembershipExtension() {
|
||||
|
||||
@@ -565,7 +564,7 @@ public class MembershipManager {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* Calculate price.
|
||||
*/
|
||||
public void calculatePrice() {
|
||||
int membershipItemId = systemPropertyManager
|
||||
@@ -631,10 +630,11 @@ public class MembershipManager {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param writer
|
||||
* @param includeInactive
|
||||
* @return
|
||||
* Membership csv export.
|
||||
*
|
||||
* @param writer the writer
|
||||
* @param includeInactive the include inactive
|
||||
* @return the json array
|
||||
*/
|
||||
public JsonArray membershipCsvExport(Writer writer, boolean includeInactive) {
|
||||
String membershipItemId = systemPropertyManager
|
||||
@@ -726,7 +726,7 @@ public class MembershipManager {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* Cron.
|
||||
*/
|
||||
@Scheduled(cron = "${we.bstly.membership.cron:0 0 0 * * * }")
|
||||
public void cron() {
|
||||
@@ -737,11 +737,12 @@ public class MembershipManager {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param path
|
||||
* @param queryParams
|
||||
* @param result
|
||||
* @return
|
||||
* Fetch all order positions.
|
||||
*
|
||||
* @param path the path
|
||||
* @param queryParams the query params
|
||||
* @param result the result
|
||||
* @return the list
|
||||
*/
|
||||
protected List<JsonObject> fetchAllOrderPositions(String path,
|
||||
MultiValueMap<String, String> queryParams, List<JsonObject> result) {
|
||||
@@ -762,10 +763,11 @@ public class MembershipManager {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param orderPosition
|
||||
* @param question
|
||||
* @return
|
||||
* Gets the answer object.
|
||||
*
|
||||
* @param orderPosition the order position
|
||||
* @param question the question
|
||||
* @return the answer object
|
||||
*/
|
||||
protected JsonObject getAnswerObject(JsonObject orderPosition, int question) {
|
||||
if (orderPosition.has("answers")) {
|
||||
@@ -780,10 +782,11 @@ public class MembershipManager {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param orderPosition
|
||||
* @param question
|
||||
* @return
|
||||
* Gets the number answer.
|
||||
*
|
||||
* @param orderPosition the order position
|
||||
* @param question the question
|
||||
* @return the number answer
|
||||
*/
|
||||
protected int getNumberAnswer(JsonObject orderPosition, int question) {
|
||||
JsonObject answer = getAnswerObject(orderPosition, question);
|
||||
@@ -794,10 +797,11 @@ public class MembershipManager {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param orderPosition
|
||||
* @param question
|
||||
* @return
|
||||
* Gets the date answer.
|
||||
*
|
||||
* @param orderPosition the order position
|
||||
* @param question the question
|
||||
* @return the date answer
|
||||
*/
|
||||
protected Instant getDateAnswer(JsonObject orderPosition, int question) {
|
||||
JsonObject answer = getAnswerObject(orderPosition, question);
|
||||
|
||||
+28
-15
@@ -29,8 +29,7 @@ import de.bstly.we.controller.support.EntityResponseStatusException;
|
||||
import de.bstly.we.membership.businesslogic.MembershipManager;
|
||||
|
||||
/**
|
||||
* @author _bastler@bstly.de
|
||||
*
|
||||
* The Class MembershipController.
|
||||
*/
|
||||
|
||||
@RestController
|
||||
@@ -44,8 +43,9 @@ public class MembershipController extends BaseController {
|
||||
private String WEBHOOK_KEY;
|
||||
|
||||
/**
|
||||
*
|
||||
* @param response
|
||||
* Cron.
|
||||
*
|
||||
* @param response the response
|
||||
*/
|
||||
@PreAuthorize("hasRole('ROLE_ADMIN')")
|
||||
@PostMapping("/cron")
|
||||
@@ -54,8 +54,9 @@ public class MembershipController extends BaseController {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param response
|
||||
* Generate membership ids.
|
||||
*
|
||||
* @param response the response
|
||||
*/
|
||||
@PreAuthorize("hasRole('ROLE_ADMIN')")
|
||||
@PostMapping("/ids")
|
||||
@@ -64,8 +65,9 @@ public class MembershipController extends BaseController {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param response
|
||||
* Active memberships.
|
||||
*
|
||||
* @param response the response
|
||||
*/
|
||||
@PreAuthorize("hasRole('ROLE_ADMIN')")
|
||||
@PostMapping("/active")
|
||||
@@ -74,8 +76,9 @@ public class MembershipController extends BaseController {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param response
|
||||
* Creates the membership extension.
|
||||
*
|
||||
* @param response the response
|
||||
*/
|
||||
@PreAuthorize("hasRole('ROLE_ADMIN')")
|
||||
@PostMapping("/extension")
|
||||
@@ -84,8 +87,9 @@ public class MembershipController extends BaseController {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param response
|
||||
* Calculate price.
|
||||
*
|
||||
* @param response the response
|
||||
*/
|
||||
@PreAuthorize("hasRole('ROLE_ADMIN')")
|
||||
@PostMapping("/calculateprice")
|
||||
@@ -93,6 +97,14 @@ public class MembershipController extends BaseController {
|
||||
membershipManager.calculatePrice();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the member mail list.
|
||||
*
|
||||
* @param includeInactive the include inactive
|
||||
* @param response the response
|
||||
* @return the member mail list
|
||||
* @throws IOException Signals that an I/O exception has occurred.
|
||||
*/
|
||||
@PreAuthorize("hasRole('ROLE_ADMIN')")
|
||||
@GetMapping("/export")
|
||||
public void getMemberMailList(
|
||||
@@ -105,9 +117,10 @@ public class MembershipController extends BaseController {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param webhookKey
|
||||
* @param payload
|
||||
* Webhook.
|
||||
*
|
||||
* @param webhookKey the webhook key
|
||||
* @param payload the payload
|
||||
*/
|
||||
@PostMapping("/pretix/webhook")
|
||||
public void webhook(@RequestParam("key") String webhookKey, @RequestBody String payload) {
|
||||
|
||||
Reference in New Issue
Block a user