Merge pull request #123 from appirio-tech/revert-122-dev

Revert "Fix group checks"

Author: ThomasKranitsas

.circleci/config.yml

@@ -1,27 +1,74 @@
 version: 2
-
-# Java image for java project
-java_env: &java_env
+jobs:
+  "build-dev":
     docker:
       - image: circleci/openjdk:8-jdk
- 
-install_deploysuite: &install_deploysuite
-          name: Installation of install_deploysuite.
+    steps:
+      # Initialization1.
+      - run: git clone --branch master https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+      - checkout
+      - run:
+          name: Installation of build dependencies.
+          command: |
+            sudo apt install jq
+            sudo apt install awscli
+      - run:
+          name: Configuring maven
+          command: |
+            MVNSERVERSETTING='<server>\n  <id>tcrepo</id> \n <username>${env.MVNUSERNAME}</username> \n <password>${env.MVNPASSWD}</password> \n  </server> '
+            C=$(echo $MVNSERVERSETTING | sed 's/\//\\\//g')
+            sudo sed -i.bak "/<\/servers>/ s/.*/${C}\n&/" /opt/apache-maven/conf/settings.xml
+            MVNSERVERSETTING='<server>\n  <id>tcreposnap</id> \n <username>${env.MVNUSERNAME}</username> \n <password>${env.MVNPASSWD}</password> \n  </server> '
+            C=$(echo $MVNSERVERSETTING | sed 's/\//\\\//g')
+            sudo sed -i.bak "/<\/servers>/ s/.*/${C}\n&/" /opt/apache-maven/conf/settings.xml     
+      - setup_remote_docker          
+      - restore_cache:
+          key: ap-review-microservice-{{ checksum "~/project/service/pom.xml" }}
+      - run: mvn -f ~/project/service/pom.xml dependency:go-offline
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: ap-review-microservice-{{ checksum "~/project/service/pom.xml" }}
+      - run: mvn -f ~/project/service/pom.xml clean site package
+      - run:
+          name: Save test results
           command: |
-            git clone --branch v1.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
-            cp ./../buildscript/master_deploy.sh .
-            cp ./../buildscript/buildenv.sh .
-            cp ./../buildscript/awsconfiguration.sh .      
+            mkdir -p ~/junit/
+            find . -type f -regex ".*/target/site/cobertura/coverage.xml" -exec cp {} ~/junit/ \;
+           # find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/junit/ \;
+          when: always
+      - store_test_results:
+          path: ~/junit
+      - store_artifacts:
+          path: ~/junit 
+      - run: docker --version
+      - run:
+          name: Deploy to AWS
+          command: |
+            chmod +x /home/circleci/project/service/build/deploy.sh
+            /home/circleci/project/service/build/deploy.sh /home/circleci/project /home/circleci/project/service/build ap-review dev
 
-build_steps: &build_steps
+  "build-prod":
+    docker:
+      - image: circleci/openjdk:8-jdk
+    steps:
       # Initialization1.
+      - run: git clone --branch master https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
       - checkout
-      - run: *install_deploysuite
       - run:
           name: Installation of build dependencies.
           command: |
             sudo apt install jq
-            sudo apt install awscli 
+            sudo apt install awscli
+      - run:
+          name: Configuring maven
+          command: |
+            MVNSERVERSETTING='<server>\n  <id>tcrepo</id> \n <username>${env.MVNUSERNAME}</username> \n <password>${env.MVNPASSWD}</password> \n  </server> '
+            C=$(echo $MVNSERVERSETTING | sed 's/\//\\\//g')
+            sudo sed -i.bak "/<\/servers>/ s/.*/${C}\n&/" /opt/apache-maven/conf/settings.xml
+            MVNSERVERSETTING='<server>\n  <id>tcreposnap</id> \n <username>${env.MVNUSERNAME}</username> \n <password>${env.MVNPASSWD}</password> \n  </server> '
+            C=$(echo $MVNSERVERSETTING | sed 's/\//\\\//g')
+            sudo sed -i.bak "/<\/servers>/ s/.*/${C}\n&/" /opt/apache-maven/conf/settings.xml     
       - setup_remote_docker          
       - restore_cache:
           key: ap-review-microservice-{{ checksum "~/project/service/pom.xml" }}
@@ -46,37 +93,19 @@ build_steps: &build_steps
       - run:
           name: Deploy to AWS
           command: |
-            ./awsconfiguration.sh $DEPLOY_ENV
-            source awsenvconf
             chmod +x /home/circleci/project/service/build/deploy.sh
-            /home/circleci/project/service/build/deploy.sh /home/circleci/project /home/circleci/project/service/build ap-review $DEPLOY_APP_ENV
-
-jobs:
-  "build-dev":
-    <<: *java_env
-    environment:
-      DEPLOY_APP_ENV: "dev"
-      DEPLOY_ENV: "DEV"      
-    steps: *build_steps    
-  "build-prod":           
-    <<: *java_env
-    environment:
-      DEPLOY_APP_ENV: "prod"
-      DEPLOY_ENV: "PROD" 
-    steps: *build_steps
+            /home/circleci/project/service/build/deploy.sh /home/circleci/project /home/circleci/project/service/build ap-review prod
 
 workflows:
   version: 2
   build:
     jobs:
       # Development builds are executed on "develop" branch only.
       - "build-dev":
-          context : org-global
           filters:
             branches:
               only: dev
       - "build-prod":
-          context : org-global
           filters:
             branches:
-              only: master
+              only: master        

local/run.sh

@@ -7,6 +7,5 @@ export DW_PW=1nf0rm1x
 export DW_URL=jdbc:informix-sqli://$IP:2021/common_dw:INFORMIXSERVER=informixoltp_tcp;IFX_LOCK_MODE_WAIT=5;OPTCOMPIND=0;STMT_CACHE=1
 export TC_JWT_KEY=secret
 export GROUP_SERVICE_ENDPOINT="http://$IP:8080/v3/groups?memberId=%s&membershipType=User-Group"
-export PARENT_GROUP_SERVICE_ENDPOINT="http://$IP:8080/v3/groups/%s/getParentGroup?oneLevel=false"
 
 java -jar ../service/target/review-microservice-*.jar server ../service/src/main/resources/review-service.yaml

service/build/deploy.sh

@@ -25,9 +25,9 @@ AWS_S3_KEY="services/docker/$IMAGE"
 ENV_JAVA_PARAMS=" "
 ENV_CONFIG=`echo "$ENV" | tr '[:lower:]' '[:upper:]'`
 
-# AWS_REGION=$(eval "echo \$${ENV_CONFIG}_AWS_REGION")
-# AWS_ACCESS_KEY_ID=$(eval "echo \$${ENV_CONFIG}_AWS_ACCESS_KEY_ID")
-# AWS_SECRET_ACCESS_KEY=$(eval "echo \$${ENV_CONFIG}_AWS_SECRET_ACCESS_KEY")
+AWS_REGION=$(eval "echo \$${ENV_CONFIG}_AWS_REGION")
+AWS_ACCESS_KEY_ID=$(eval "echo \$${ENV_CONFIG}_AWS_ACCESS_KEY_ID")
+AWS_SECRET_ACCESS_KEY=$(eval "echo \$${ENV_CONFIG}_AWS_SECRET_ACCESS_KEY")
 
 configure_aws_cli() {
 	aws --version
@@ -38,7 +38,7 @@ configure_aws_cli() {
 	echo "Configured AWS CLI."
 }
 
-# configure_aws_cli
+configure_aws_cli
 
 # Elastic Beanstalk Application name
 # dev
@@ -110,4 +110,4 @@ aws elasticbeanstalk create-application-version --application-name $APPNAME --ve
 
 echo "Updating EBS with the version $IMAGE \n"
 # assumes beanstalk app for this service has already been created and configured
-aws elasticbeanstalk update-environment --environment-name $SERVICE-$ENV --version-label $IMAGE
+aws elasticbeanstalk update-environment --environment-name $SERVICE-$ENV --version-label $IMAGE

service/pom.xml

@@ -10,7 +10,7 @@
 	    <dropwizard.version>1.0.0</dropwizard.version>
 	    <powermock.version>1.5.4</powermock.version>
 	    <jackson-version>2.7.3</jackson-version>
-	    <core.api.version>4.3.1</core.api.version>
+	    <core.api.version>4.2.0</core.api.version>
 	    <supply-library.version>1.0.20-SNAPSHOT</supply-library.version>
 	</properties>
 
@@ -60,9 +60,6 @@
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.18.1</version>
-				<configuration>
-       					<forkCount>0</forkCount>
-   				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -291,7 +288,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>3.0.4</version>
+				<version>3.0.0</version>
 				<configuration>
 					<onlyAnalyze>com.appirio.service.-</onlyAnalyze>
 					<effort>Max</effort>
@@ -304,7 +301,7 @@
 	<repositories>
 		 <repository>
      		 <id>tcrepo</id>
-     		 <url>http://tc-mvn-repo.s3-website-us-east-1.amazonaws.com/release</url>
+     		 <url>s3://tc-mvn-repo/release</url>
       		<snapshots>
        			 <enabled>false</enabled>
         		<updatePolicy>always</updatePolicy>
@@ -316,7 +313,7 @@
    		 </repository>
    		 <repository>
    		   <id>tcreposnap</id>
-    		  <url>http://tc-mvn-repo.s3-website-us-east-1.amazonaws.com/snapshot</url>
+    		  <url>s3://tc-mvn-repo/snapshot</url>
      		 <snapshots>
       			  <enabled>true</enabled>
       		 	 <updatePolicy>always</updatePolicy>

service/src/main/java/com/appirio/service/resourcefactory/ReviewOpportunitiesFactory.java

@@ -5,10 +5,10 @@
 import com.appirio.service.review.manager.ReviewOpportunitiesManager;
 import com.appirio.service.review.resources.ReviewOpportunitiesResource;
 import com.appirio.service.review.util.GroupServiceClient;
-import com.appirio.service.review.util.ParentGroupServiceClient;
 import com.appirio.service.supply.resources.ResourceFactory;
 import com.appirio.supply.DAOFactory;
 import com.appirio.supply.SupplyException;
+import com.appirio.supply.dataaccess.db.IdGenerator;
 
 /**
  * ReviewOpportunitiesFactory is used to create the ReviewOpportunitiesResource
@@ -42,15 +42,9 @@
  *     </ul>
  * </p>
  *
- * <p>
- *     Version 1.5 (Topcoder Review Service - Fix Group Checks v1.0)
- *     <ul>
- *         <li>Create ReviewOpportunitiesManager with the GroupServiceClient and ParentGroupServiceClient</li>
- *     </ul>
- * </p>
  *
  * @author TCCoder
- * @version 1.5
+ * @version 1.4
  *
  */
 public class ReviewOpportunitiesFactory implements ResourceFactory<ReviewOpportunitiesResource> {
@@ -60,20 +54,13 @@ public class ReviewOpportunitiesFactory implements ResourceFactory<ReviewOpportu
      */
     private final GroupServiceClient groupServiceClient;
 
-    /**
-     * The parent group service client
-     */
-    private final ParentGroupServiceClient parentGroupServiceClient;
-
     /**
      * Simple constructor to initialize ReviewOpportunitiesFactory
      *
      * @param groupServiceClient the groupServiceClient to use
-     * @param parentGroupServiceClient the parent groupServiceClient to use
      */
-    public ReviewOpportunitiesFactory(GroupServiceClient groupServiceClient, ParentGroupServiceClient parentGroupServiceClient) {
+    public ReviewOpportunitiesFactory(GroupServiceClient groupServiceClient) {
         this.groupServiceClient = groupServiceClient;
-        this.parentGroupServiceClient = parentGroupServiceClient;
     }
 
     /**
@@ -86,7 +73,7 @@ public ReviewOpportunitiesResource getResourceInstance() throws SupplyException
         final ReviewOpportunitiesDAO dao = DAOFactory.getInstance().createDAO(ReviewOpportunitiesDAO.class);
         final ChallengeDAO challengeDao = DAOFactory.getInstance().createDAO(ChallengeDAO.class);
         final ReviewOpportunitiesManager reviewOpportunitiesManager =
-                new ReviewOpportunitiesManager(dao, challengeDao, this.groupServiceClient, this.parentGroupServiceClient);
+                new ReviewOpportunitiesManager(dao, challengeDao, this.groupServiceClient);
         return new ReviewOpportunitiesResource(reviewOpportunitiesManager);
     }
 }