Fixed issues on property managemen

Author: spectralcodex

microservice-common/src/main/java/io/vertx/easyerp/microservice/common/RestAPIVerticle.java

@@ -154,6 +154,18 @@ protected <T> Handler<AsyncResult<T>> resultHandler(RoutingContext context) {
  };
  }
 
+ protected <T> Handler<AsyncResult<T>> resultHandler(RoutingContext context, int status) {
+ return ar -> {
+ if (ar.succeeded()) {
+ T res = ar.result();
+ context.response()
+ .setStatusCode(status == 0 ? 200 : status)
+ .putHeader("Content-type", "application/json")
+ .end(res == null ? "{}" : new JsonObject().put("msg", res.toString()).encodePrettily());
+ }
+ };
+ }
+
  protected <T> Handler<AsyncResult<T>> resultHandler(RoutingContext context, Function<T, String> converter) {
  return ar -> {
  if (ar.succeeded()) {
@@ -227,6 +239,7 @@ protected <T> Handler<AsyncResult<T>> rawResultHandler(RoutingContext context) {
  };
  }
 
+
  /**
  * This method generates handler for jooq.async methods in REST APIs.
  * The result is not needed. Only the state of the jooq.async result is required.
@@ -250,6 +263,8 @@ protected Handler<AsyncResult<Void>> resultVoidHandler(RoutingContext context, J
  };
  }
 
+
+
  protected Handler<AsyncResult<Void>> resultVoidHandler(RoutingContext context, int status) {
  return ar -> {
  if (ar.succeeded()) {
@@ -276,7 +291,8 @@ protected Handler<AsyncResult<Void>> resultVoidHandler(RoutingContext context, i
  * @param context routing context instance
  * @return generated handler
  */
- protected Handler<AsyncResult<Void>> deleteResultHandler(RoutingContext context) {
+
+ protected<T> Handler<AsyncResult<T>> deleteResultHandler(RoutingContext context) {
  return res -> {
  if (res.succeeded()) {
  context.response().setStatusCode(204)
@@ -289,6 +305,8 @@ protected Handler<AsyncResult<Void>> deleteResultHandler(RoutingContext context)
  };
  }
 
+
+
  // helper method dealing with failure
 
  protected void internalError(RoutingContext context, Throwable ex) {

microservice-common/src/main/java/io/vertx/easyerp/microservice/common/service/JooqRepositoryWrapper.java

@@ -59,9 +59,4 @@ protected Future<SQLConnection> getConnection() {
  this.nonShared.getConnection(promise);
  return promise.future();
  }
-
- protected AsyncClassicGenericQueryExecutor queryExecutor(){
- return this.executor;
- }
-
 }

property-management-microservice/src/main/java/io/vertx/easyerp/microservice/propertymanagement/api/PropertyManagementRestVerticle.java

@@ -3,7 +3,11 @@
 import io.vertx.core.Promise;
 import io.vertx.easyerp.microservice.common.RestAPIVerticle;
 import io.vertx.easyerp.microservice.propertymanagement.PropertyManagementService;
+import io.vertx.easyerp.microservice.propertymanagement.jpojo.Accommodation;
+import io.vertx.easyerp.microservice.propertymanagement.jpojo.PropertyAmenity;
+import io.vertx.easyerp.microservice.propertymanagement.jpojo.PropertyProfile;
 import io.vertx.ext.web.Router;
+import io.vertx.ext.web.RoutingContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,17 +46,83 @@ public void start(Promise<Void> startPromise) throws Exception {
  final Router router = enableRouteLoggingSupport(Router.router(vertx));
 
  // api route handler
- /*router.post(API_ADD).handler(this::apiAddUser);
+ /*
+ router.post(API_ADD).handler(this::apiAddUser);
  router.get(API_RETRIEVE).handler(this::apiRetrieveUser);
  router.get(API_RETRIEVE_ALL).handler(this::apiRetrieveAll);
  router.patch(API_UPDATE).handler(this::apiUpdateUser);
  router.delete(API_DELETE).handler(this::apiDeleteUser);
-*/
+ */
+
+ router.post(API_PROFILE_ADD).handler(this::addPropProfile);
+
  String host = config().getString("property.http.address", "0.0.0.0");
  int port = config().getInteger("property.http.port", 8085);
 
  createHttpServer(router, host, port)
  .compose(serverCreated -> publishHttpEndpoint(SERVICE_NAME, host, port))
  .onComplete(startPromise);
  }
+
+ private void addPropProfile(RoutingContext context){
+ PropertyProfile profile = new PropertyProfile(context.getBodyAsJson());
+ service.createProfile(profile, resultHandler(context, 201));
+ }
+
+ private void editPropProfile(RoutingContext context){
+ notImplemented(context);
+ }
+
+ private void fetcPropProfile(RoutingContext context){
+ String id = context.request().getParam("id");
+ service.retrieveProfile(id, resultHandlerNonEmpty(context));
+ }
+
+ private void deletePropProfile(RoutingContext context){
+ String serialNo = context.request().getParam("Id");
+ service.deleteProfile(serialNo, deleteResultHandler(context));
+ }
+
+ private void addPropAmenity(RoutingContext context){
+ PropertyAmenity propertyAmenity = new PropertyAmenity((context.getBodyAsJson()));
+ service.createAmenity(propertyAmenity, resultHandler(context, 201));
+ }
+
+ private void editPropAmenity(RoutingContext context){
+ notImplemented(context);
+ }
+
+ private void fetchPropAmenities(RoutingContext context){
+ service.retrieveAmenities(resultHandlerNonEmpty(context));
+ }
+
+
+ private void deletePropAmenity(RoutingContext context){
+ String serialNo = context.request().getParam("Id");
+ service.deleteAmenity(serialNo, deleteResultHandler(context));
+ }
+
+ private void addAccommodation(RoutingContext context){
+ Accommodation accommodation = new Accommodation(context.getBodyAsJson());
+ service.createAccommodation(accommodation, resultHandler(context, 201));
+ }
+
+
+ private void fetchAccommodations(RoutingContext context){
+ service.retrieveAllAccommodations(resultHandlerNonEmpty(context));
+ }
+
+ private void fetchAccommodation(RoutingContext context){
+ String id = context.request().getParam("id");
+ service.retrieveAccommodation(id , resultHandlerNonEmpty(context));
+ }
+
+
+ private void deleteAccommodation(RoutingContext context){
+ String serialNo = context.request().getParam("Id");
+ service.deleteAccommodation(serialNo, deleteResultHandler(context));
+ }
+
 }
+
+

property-management-microservice/src/main/java/io/vertx/easyerp/microservice/propertymanagement/jpojo/Accommodation.java

@@ -18,12 +18,12 @@ public class Accommodation {
  private String createdBy;
 
  public Accommodation(JsonObject json) {
- // PropertyProfileConverter.fromJson(json, this);
+  AccomodationConverter.fromJson(json, this);
  }
 
  public JsonObject toJson() {
  JsonObject json = new JsonObject();
- //PropertyProfileConverter.toJson(this, json);
+ AccomodationConverter.toJson(this, json);
  return json;
  }