Commit 5b04017a authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch... 

Merge branch '87-return-correct-fields-for-searching-service-and-product-specifications' into 'develop'

Resolve "return correct fields for searching service and product specifications"

See merge request !82
parents 5e4c898e 526eeeac

src/main/java/org/etsi/osl/tmf/pcm620/reposervices/ProductOfferingRepoService.java

+2 −1
Original line number Diff line number Diff line
@@ -706,7 +706,8 @@ public class ProductOfferingRepoService { 
      Transaction tx = session.beginTransaction();

      

      try {

        String sql = "SELECT p.id as productOfferingId, p.name as productName, p.description as productDescription";

        String sql = "SELECT p.id as productOfferingId, p.name as productName, p.description as productDescription,"

            + "  p.type, p.isBundle, pcateg.name as categoryName";

src/main/java/org/etsi/osl/tmf/scm633/reposervices/ServiceSpecificationRepoService.java

+2 −1
Original line number Diff line number Diff line
@@ -1528,7 +1528,8 @@ public class ServiceSpecificationRepoService { 
        Transaction tx = session.beginTransaction();

        

        try {

          String sql = "SELECT s.id as serviceSpecificationId, s.name as serviceName, s.description as serviceDescription";

          String sql = "SELECT s.id as serviceSpecificationId, s.name as serviceName, s.description as serviceDescription,"

              + " s.type, s.isBundle, scateg.name as categoryName";