Fixes for seeDeleted functionality for user.

Author: computate

src/main/java/org/computate/vertx/api/BaseApiServiceImpl.java

@@ -244,6 +244,7 @@ public <T extends ComputateSiteRequest> Future<T> user(ServiceRequest serviceReq
 										siteRequest.setUserKey(pk);
 										siteRequest.setApiRequest_(apiRequest);
 										siteRequest.setUserPrincipal(userPrincipal);
+										siteRequest.setSiteUser(siteUser1);
 										promise.complete(siteRequest);
 									}).onFailure(ex -> {
 										LOG.error(String.format("postSiteUser failed. "), ex);
@@ -257,6 +258,8 @@ public <T extends ComputateSiteRequest> Future<T> user(ServiceRequest serviceReq
 									jsonObject.put("setUserCompleteName", accessToken.getString("name"));
 									jsonObject.put("setUserId", accessToken.getString("sub"));
 									jsonObject.put("setUserEmail", accessToken.getString("email"));
+									jsonObject.put("setSeeDeleted", siteUser1.getSeeDeleted());
+									jsonObject.put("setSeeArchived", siteUser1.getSeeArchived());
 									Boolean define = userDefine(siteRequest, jsonObject, true);
 									if(define) {
 
@@ -299,9 +302,10 @@ public <T extends ComputateSiteRequest> Future<T> user(ServiceRequest serviceReq
 											siteRequest.setUserLastName(accessToken.getString("family_name"));
 											siteRequest.setUserEmail(accessToken.getString("email"));
 											siteRequest.setUserId(accessToken.getString("sub"));
-											siteRequest.setUserKey(Long.parseLong(responseBody.getString("pk")));
+											siteRequest.setUserKey(siteUser1.getPk());
 											siteRequest.setApiRequest_(apiRequest);
 											siteRequest.setUserPrincipal(userPrincipal);
+											siteRequest.setSiteUser(siteUser1);
 											promise.complete(siteRequest);
 										}).onFailure(ex -> {
 											LOG.error(String.format("postSiteUser failed. "), ex);
@@ -313,6 +317,7 @@ public <T extends ComputateSiteRequest> Future<T> user(ServiceRequest serviceReq
 										siteRequest.setUserLastName(siteUser1.getUserLastName());
 										siteRequest.setUserKey(siteUser1.getPk());
 										siteRequest.setUserPrincipal(userPrincipal);
+										siteRequest.setSiteUser(siteUser1);
 										promise.complete((T)siteRequest);
 									}
 								}
@@ -687,4 +692,8 @@ public void responsePivotSearch(Map<String, SolrResponse.Pivot> pivots, JsonObje
 			}
 		}
 	}
+
+	public void calendarStuff() {
+		
+	}
 }

src/main/java/org/computate/vertx/request/ComputateSiteRequest.java

@@ -88,6 +88,8 @@ public interface ComputateSiteRequest extends ComputateSearchSiteRequest {
 
 	<T extends ComputateSiteUser> T getSiteUser_(Class<T> clazz);
 
+	<T extends ComputateSiteUser> void setSiteUser(T siteUser_);
+
 	User getUser();
 
 	JsonObject getUserPrincipal();

src/main/java/org/computate/vertx/result/base/ComputateBaseResult.java

@@ -18,7 +18,7 @@
  */
 public interface ComputateBaseResult {
 
-	public Long getId();
+	public String getId();
 
 	public Object obtainForClass(String v);
 

src/main/java/org/computate/vertx/result/java/ComputateJavaClassEnUSApiServiceImpl.java

@@ -30,8 +30,8 @@ public void searchComputateJavaClass2(ComputateSiteRequest siteRequest, Boolean
 		String solrHostName = siteRequest.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
 		Integer solrPort = siteRequest.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
 		String solrCollection = "computate";
-		String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, request.getQueryString());
-		w.o(String.format("http://%s:%s%s", "localhost", solrPort, solrRequestUri));
+//		String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, request.getQueryString());
+//		w.o(String.format("http://%s:%s%s", "localhost", solrPort, solrRequestUri));
 		searchList.setSearchUrl(null);
 	}
 }

src/main/java/org/computate/vertx/search/list/SearchList.java

@@ -386,7 +386,11 @@ protected void _response(Promise<SolrResponse> promise) {
 		try {
 			if(request.getQuery() != null) {
 				request.initDeepForClass(siteRequest_);
-				siteRequest_.getWebClient().get(searchUrl).send().onSuccess(a -> {
+				String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
+				Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
+				String solrCollection = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_COLLECTION);
+				String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, request.getQueryString());
+				siteRequest_.getWebClient().get(solrPort, solrHostName, solrRequestUri).send().onSuccess(a -> {
 					try {
 						SolrResponse response = a.bodyAsJson(SolrResponse.class);
 						setResponse(response);