Docker aws

.github/workflows/deploy-to-ec2.yml

@@ -0,0 +1,51 @@
+name: Deploy to EC2
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Set up AWS CLI
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Login to Amazon ECR Public
+        id: login-ecr
+        run: aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin ${{ secrets.AWS_ECR_URI }}
+
+      - name: Build Docker image
+        run: docker build -t skill-tree-backend -f skill-tree/Dockerfile .
+      - name: Tag Docker image
+        run: docker tag skill-tree-backend:latest ${{ secrets.AWS_ECR_URI }}/skill-tree-backend:latest
+
+      - name: Push Docker image to ECR Public
+        run: docker push ${{ secrets.AWS_ECR_URI }}/skill-tree-backend:latest
+
+  deploy: 
+    needs: build-and-push
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to EC2
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.AWS_EC2_HOST }}
+          username: ${{ secrets.AWS_EC2_USERNAME }}
+          key: ${{ secrets.AWS_EC2_SSH_PRIVATE_KEY }}
+      - name: Pull Image from docker hub
+        run: docker pull ${{ secrets.AWS_ECR_URI }}/skill-tree-backend:latest
+      - name: Delete old container
+        run: docker rm -f skill-tree-backend
+      - name: Run docker container
+        run: docker run -d -p 8080:8080 --name skill-tree-backend -e RDS_PUBLIC_KEY=${{secrets.RDS_PUBLIC_KEY}} -e API_V1_PREFIX=/api/v1 ${{ secrets.AWS_ECR_URI }}/skill-tree-backend
+

.gitignore

@@ -28,4 +28,4 @@ replay_pid*
 
 *.env
 
-target/
+target/

api-contracts.yml

@@ -227,24 +227,25 @@ paths:
 
 
 
-  /endorsements/{endorsementId}:
+  /endorsements/{id}?status={EndorsementStatus}:
     patch:
       tags:
         - endorsements
       parameters:
-        - name: endorsementId
+        - name: id
           schema:
             type: string
+            format: UUID
           in: path
           description: EndorsementId which has to be modified
           required: true
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              $ref: '#/components/schemas/endorsementUpdate'
+        - name: status
+          schema:
+            type: string,
+            format: EndorsementStatus,
+          in: query       
+          description: New endorsement status which has to be updated
+          required: true   
       summary: Update endorsement status given endorsementId
       description: Update endorsement status given endorsement id, **this can be only used by Super User for now**
       operationId: updateEndorsementStatusGivenId
@@ -256,8 +257,7 @@ paths:
             application/json:
               schema:
                 type: object
-                $ref: '#/components/schemas/endorsementResponse'
-
+                $ref: '#/components/schemas/UpdateEndorsementResponse'
 
         '400':
           description: Invalid endorsement Id value
@@ -267,6 +267,30 @@ paths:
                 type: object
                 $ref: '#/components/schemas/ApiResponseFailureInvalidParameter'
 
+        '400':
+          description: Invalid endorsement status
+          content:
+            application/json:
+              schema:
+                type: object
+                $ref: '#/components/schemas/ApiResponseFailureInvalidParameter'
+
+        '409':
+          description: Updating the status of an endorsement that has been accepted/rejected
+          content:
+            application/json:
+              schema:
+                type: object
+                $ref: '#/components/schemas/ApiResponseFailureEndorsementUpdateResponse'
+
+        '403':
+          description: Unauthorized access, user is not a super user
+          content:
+            application/json:
+              schema:
+                type: object
+                $ref: '#/components/schemas/ApiResponseFailureUnauthorized'
+
         '503':
           description: Service Unavailable
           content:
@@ -580,4 +604,37 @@ components:
     ApiResponseForSkillName:
       type: array
       items:  
-        $ref: '#/components/schemas/skillUsersResponse'
+        $ref: '#/components/schemas/skillUsersResponse'
+
+    UpdateEndorsementResponse:
+      type: object
+      properties:
+        code:
+          type: integer
+          format: int32
+          example: 200
+        message:
+          type: string  
+          example: Successfully updated endorsement status
+
+    ApiResponseFailureUnauthorized:
+      type: object
+      properties:
+        code:
+          type: integer
+          format: int32
+          example: 403
+        message:
+          type: string  
+          example: Unauthorized, Access is only available to super users
+
+    ApiResponseFailureEndorsementUpdateResponse:
+      type: object
+      properties:
+        code:
+          type: integer
+          format: int32
+          example: 409
+        message:
+          type: string  
+          example: Endorsement is already updated, Cannot modify status

skill-tree/Dockerfile

@@ -0,0 +1,11 @@
+FROM openjdk:17-jdk as build
+WORKDIR /app
+COPY skill-tree .
+RUN ./mvnw --version
+RUN ./mvnw clean install -DskipTests
+
+FROM openjdk:17-jdk
+WORKDIR /app
+COPY --from=build /app/target/*.jar app.jar
+EXPOSE 8080
+ENTRYPOINT ["java", "-jar", "app.jar"]

skill-tree/docker-compose.yml

@@ -2,8 +2,6 @@ version: "3.7"
 services:
   db:
     image: mysql
-    # NOTE: use of "mysql_native_password" is not recommended: https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password
-    # (this is just an example, not intended to be a production configuration)
     command: --default-authentication-plugin=mysql_native_password
     ports:
       - 3306:3306
@@ -13,9 +11,33 @@ services:
       MYSQL_PASSWORD: testpassword
       MYSQL_ROOT_PASSWORD: password
     volumes:
-      - ./skilltree-database-script.sql:/docker-entrypoint-initdb.d/skilltree-database-script.sql
+      - mysql-data:/var/lib/mysql
 
   adminer:
     image: adminer
     ports:
-      - 9000:8080
+      - 9000:8080
+
+  spring-boot-app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    depends_on:
+      - db
+    ports:
+      - 8080:8080
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:mysql://db:3306/skilltree
+      SPRING_DATASOURCE_USERNAME: testuser
+      SPRING_DATASOURCE_PASSWORD: testpassword
+      SPRING_JPA_HIBERNATE_DDL_AUTO: update
+      MYSQL_HOST: db
+      DB_NAME: skilltree
+      MYSQL_DB_USERNAME: testuser
+      MYSQL_DB_PASSWORD: testpassword
+      DB_DDL_POLICY: update
+      API_V1_PREFIX: /api/v1
+      SPRING_DATASOURCE_VERSION: 8.1.0
+
+volumes:
+  mysql-data:

skill-tree/src/main/java/com/RDS/skilltree/Endorsement/EndorsementController.java

@@ -79,4 +79,10 @@ public ResponseEntity<GenericResponse<EndorsementDTO>> postEndorsement(
                 new GenericResponse<EndorsementDTO>(null, "Failed to create endorsement"),
                 HttpStatus.BAD_REQUEST);
     }
+
+    @PatchMapping(value = "/{id}")
+    public ResponseEntity<GenericResponse<Void>> updateEndorsementStatus(
+            @PathVariable(value = "id") UUID id, @RequestParam String status) {
+        return ResponseEntity.ok().body(endorsementService.updateEndorsementStatus(id, status));
+    }
 }

skill-tree/src/main/java/com/RDS/skilltree/Endorsement/EndorsementDRO.java

@@ -13,7 +13,7 @@
 @Builder
 public class EndorsementDRO {
     @NotNull(message = "user id cannot be null")
-    private UUID userId;
+    private UUID endorseeId;
 
     @NotNull(message = "skill id cannot be null")
     private UUID skillId;

skill-tree/src/main/java/com/RDS/skilltree/Endorsement/EndorsementDTO.java

@@ -2,7 +2,6 @@
 
 import com.RDS.skilltree.EndorsementList.EndorsementListModel;
 import com.RDS.skilltree.Skill.SkillDTO;
-import com.RDS.skilltree.User.UserDTO;
 import com.RDS.skilltree.utils.TrackedProperties;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import java.util.List;
@@ -14,7 +13,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class EndorsementDTO extends TrackedProperties {
     private UUID id;
-    private UserDTO user;
+    private UUID endorseeId;
     private SkillDTO skill;
     private EndorsementStatus status;
     private List<EndorsementListModel> endorsersList;
@@ -23,7 +22,7 @@ public static EndorsementDTO toDto(EndorsementModel endorsementModel) {
         EndorsementDTO endorsementDTO =
                 EndorsementDTO.builder()
                         .id(endorsementModel.getId())
-                        .user(UserDTO.toDTO(endorsementModel.getUser()))
+                        .endorseeId(endorsementModel.getEndorseeId())
                         .skill(SkillDTO.toDto(endorsementModel.getSkill()))
                         .status(endorsementModel.getStatus())
                         .endorsersList(endorsementModel.getEndorsersList())

skill-tree/src/main/java/com/RDS/skilltree/Endorsement/EndorsementModel.java

@@ -2,7 +2,6 @@
 
 import com.RDS.skilltree.EndorsementList.EndorsementListModel;
 import com.RDS.skilltree.Skill.SkillModel;
-import com.RDS.skilltree.User.UserModel;
 import com.RDS.skilltree.utils.TrackedProperties;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 import jakarta.persistence.*;
@@ -23,9 +22,8 @@ public class EndorsementModel extends TrackedProperties {
     @Column(name = "id", columnDefinition = "BINARY(16)")
     private UUID id;
 
-    @ManyToOne(targetEntity = UserModel.class, cascade = CascadeType.ALL)
-    @JoinColumn(name = "user_id", referencedColumnName = "id")
-    private UserModel user;
+    @Column(name = "endorsee_id")
+    private UUID endorseeId;
 
     @ManyToOne(targetEntity = SkillModel.class, cascade = CascadeType.ALL)
     @JoinColumn(name = "skill_id", referencedColumnName = "id")

skill-tree/src/main/java/com/RDS/skilltree/Endorsement/EndorsementRepository.java

@@ -7,7 +7,7 @@
 
 @Repository
 public interface EndorsementRepository extends JpaRepository<EndorsementModel, UUID> {
-    List<EndorsementModel> findByUserId(UUID userId);
+    List<EndorsementModel> findByEndorseeId(UUID userId);
 
     List<EndorsementModel> findBySkillId(UUID skillId);
 }

skill-tree/src/main/java/com/RDS/skilltree/Endorsement/EndorsementService.java

@@ -1,5 +1,6 @@
 package com.RDS.skilltree.Endorsement;
 
+import com.RDS.skilltree.Common.Response.GenericResponse;
 import java.io.IOException;
 import java.util.UUID;
 import org.springframework.data.domain.Page;
@@ -15,4 +16,6 @@ Page<EndorsementModelFromJSON> getEndorsementsFromDummyData(
             PageRequest pageRequest, String skillID, String userID) throws IOException;
 
     EndorsementModel createEndorsement(EndorsementDRO endorsementDRO);
+
+    GenericResponse<Void> updateEndorsementStatus(UUID id, String status);
 }