Alias offer search and other small fixes

src/brs/Burst.java

@@ -47,7 +47,7 @@
 
 public final class Burst {
 
-  public static final Version VERSION = Version.parse("v3.5.1");
+  public static final Version VERSION = Version.parse("v3.5.2-beta1");
   public static final String APPLICATION = "BRS";
 
   public static final String CONF_FOLDER = "./conf";

src/brs/db/sql/SqlAliasStore.java

@@ -7,8 +7,12 @@
 import brs.db.store.AliasStore;
 import brs.db.store.DerivedTableManager;
 import brs.util.Convert;
+
+import org.jooq.Condition;
 import org.jooq.DSLContext;
 import org.jooq.Record;
+import org.jooq.Record1;
+import org.jooq.Result;
 import org.jooq.SortField;
 
 import java.util.ArrayList;
@@ -137,8 +141,18 @@ public Collection<Alias> getAliasesByOwner(long accountId, int from, int to) {
   }
 
   @Override
-  public Collection<Alias.Offer> getAliasOffers(int from, int to) {
-    return offerTable.getManyBy(brs.schema.Tables.ALIAS_OFFER.LATEST.eq(true), from, to);
+  public Collection<Alias.Offer> getAliasOffers(long account, long buyer, int from, int to) {
+    Condition conditions = ALIAS_OFFER.LATEST.eq(true);
+    if(account != 0L) {
+      Result<Record1<Long>> myAliases = Db.useDSLContext(ctx -> {
+      return ctx.select(ALIAS.ID).from(ALIAS).where(ALIAS.ACCOUNT_ID.eq(account)).fetch();
+      });
+      conditions = conditions.and(ALIAS_OFFER.ID.in(myAliases));
+    }
+    if(buyer != 0L) {
+      conditions = conditions.and(ALIAS_OFFER.BUYER_ID.eq(buyer));
+    }
+    return offerTable.getManyBy(conditions, from, to);
   }
 
   @Override

src/brs/db/store/AliasStore.java

@@ -16,7 +16,7 @@ public interface AliasStore {
 
   Collection<Alias> getAliasesByOwner(long accountId, int from, int to);
 
-  Collection<Alias.Offer> getAliasOffers(int from, int to);
+  Collection<Alias.Offer> getAliasOffers(long account, long buyer, int from, int to);
 
   Alias getAlias(String aliasName);
 }

src/brs/http/GetAliasesOnSale.java

@@ -3,6 +3,8 @@
 import brs.Alias;
 import brs.BurstException;
 import brs.services.AliasService;
+import brs.util.Convert;
+
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -19,7 +21,7 @@ public final class GetAliasesOnSale extends APIServlet.JsonRequestHandler {
   private final AliasService aliasService;
 
   GetAliasesOnSale(AliasService aliasService) {
-    super(new APITag[]{APITag.ALIASES}, FIRST_INDEX_PARAMETER, LAST_INDEX_PARAMETER);
+    super(new APITag[]{APITag.ALIASES}, ACCOUNT_PARAMETER, BUYER_PARAMETER, FIRST_INDEX_PARAMETER, LAST_INDEX_PARAMETER);
     this.aliasService = aliasService;
   }
 
@@ -28,9 +30,20 @@ public final class GetAliasesOnSale extends APIServlet.JsonRequestHandler {
   JsonElement processRequest(HttpServletRequest req) throws BurstException {
     int firstIndex = ParameterParser.getFirstIndex(req);
     int lastIndex = ParameterParser.getLastIndex(req);
+
+    long account = 0L;
+    String accountId = Convert.emptyToNull(req.getParameter(ACCOUNT_PARAMETER));
+    if(accountId != null) {
+        account = Convert.parseUnsignedLong(accountId);
+    }
+    long buyer = 0L;
+    String buyerId = Convert.emptyToNull(req.getParameter(BUYER_PARAMETER));
+    if(buyerId != null) {
+        buyer = Convert.parseUnsignedLong(buyerId);
+    }
 
     JsonArray aliasesJson = new JsonArray();
-    Collection<Alias.Offer> aliasOffers = aliasService.getAliasOffers(firstIndex, lastIndex);
+    Collection<Alias.Offer> aliasOffers = aliasService.getAliasOffers(account, buyer, firstIndex, lastIndex);
     for(Alias.Offer offer : aliasOffers) {
       Alias alias = aliasService.getAlias(offer.getId());
       aliasesJson.add(JSONData.alias(alias, offer));

src/brs/http/GetAssetsByName.java

@@ -45,8 +45,8 @@ JsonElement processRequest(HttpServletRequest req) throws BurstException {
         }
 
         int heightEnd = Burst.getBlockchain().getHeight();
-        // default is for any height
-        int heightStart = 0;
+        // default is one day window
+        int heightStart = heightEnd - 360;
 
         String heightStartString = Convert.emptyToNull(req.getParameter(HEIGHT_START_PARAMETER));
         if(heightStartString != null) {

src/brs/services/AliasService.java

@@ -19,7 +19,7 @@ public interface AliasService {
 
   Collection<Alias> getAliasesByOwner(long accountId, int from, int to);
 
-  Collection<Alias.Offer> getAliasOffers(int from, int to);
+  Collection<Alias.Offer> getAliasOffers(long account, long buyer, int from, int to);
 
   void addOrUpdateAlias(Transaction transaction, Attachment.MessagingAliasAssignment attachment);
 

src/brs/services/impl/AliasServiceImpl.java

@@ -51,8 +51,8 @@ public Collection<Alias> getAliasesByOwner(long accountId, int from, int to) {
   }
 
   @Override
-  public Collection<Alias.Offer> getAliasOffers(int from, int to) {
-    return aliasStore.getAliasOffers(from, to);
+  public Collection<Alias.Offer> getAliasOffers(long account, long buyer, int from, int to) {
+    return aliasStore.getAliasOffers(account, buyer, from, to);
   }
 
   @Override