Folder restructure and CI/CD (#78)

* Added a restructured directory apollo

* fix failing tests

* delete unused files after restructure

* clean up

- remove unused dependecies
- edit package.json
- gitignore package-lock

* delete unused else statement

* Edit .gitignore

* Combine resolvers component files in  apollo directory

* Add trigger for deploy branch

* GoogleCloudPlatform/github-actions/setup-gcloud has been deprecated.

* update docker build from ./sources

* Update Dockerfile

* Add secrets for .env and admin sdk

* Update gcp-deploy.yml

* Update gcp-deploy.yml

* Update gcp-deploy.yml

* Update Dockerfile

* Update docker-compose.yml

* Update Dockerfile

* Update Dockerfile

* Delete docs.yml

* Update gcp-deploy.yml

* Update .dockerignore

* Update gcp-deploy.yml

* Update gcp-deploy.yml

* Update gcp-deploy.yml

* Update gcp-deploy.yml

* Update index.js

* Update gcp-deploy.yml

* Update gcp-deploy.yml

* Update gcp-deploy.yml

Co-authored-by: roshankshaw <[email protected]>
Co-authored-by: HarishTeens <[email protected]>
Co-authored-by: Harish <[email protected]>

Author: 3 people

.firebaserc

@@ -1,16 +1,13 @@
-name: Build and Deploy to Google Compute Engine
-
+name: Build and Deploy to Server
 on:
-  push:
-    branches:
-    - development
-
+  release:
+    types:
+      - created
 env:
   PROJECT_ID: ${{ secrets.GKE_PROJECT }}
   GCE_INSTANCE: server-central-vm	  
   GCE_INSTANCE_ZONE: us-central1-a   
 
-
 jobs:
   setup-build-publish-deploy:
     name: Setup, Build, Publish, and Deploy
@@ -21,7 +18,7 @@ jobs:
       uses: actions/checkout@v2
 
     # Setup gcloud CLI
-    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+    - uses: google-github-actions/setup-gcloud@master
       with:
         version: '290.0.1'
         service_account_key: ${{ secrets.GKE_KEY }}
@@ -31,11 +28,20 @@ jobs:
     # helper for authentication
     - run: |-
         gcloud --quiet auth configure-docker
-        
+    - name: Ignored Files Reveal
+      run: |-
+        echo "${{ secrets.ENV_CONFIG }}" > ./sources/env_encoded.txt
+    - run: |-
+        echo "${{ secrets.ADMIN_SDK }}" > ./sources/project-elaichi_encoded.txt
+    - run: |- 
+        cd ./sources && base64 --decode -i env_encoded.txt > .env
+    - run: |- 
+        cd ./sources && base64 --decode -i project-elaichi_encoded.txt > project-elaichi.json 
+            
     #Build the Docker image
     - name: Build
       run: |-
-        docker build --tag "gcr.io/$PROJECT_ID/$GCE_INSTANCE-image" .
+        docker build --tag "gcr.io/$PROJECT_ID/$GCE_INSTANCE-image" ./sources
    #Push the Docker image to Google Container Registry
     - name: Publish
       run: |-

.github/workflows/docs.yml

@@ -1,7 +1,12 @@
 
 sources/node_modules
 sources/db
-sources/coverage
+project-elaichi.json
+package-lock.json
+.env
+sources/.node_repl_history
+sources/.npm/
+coverage
 .vs/
 .bash_history
 .bash_logout
@@ -12,11 +17,7 @@ sources/coverage
 .gnupg/
 .mongorc.js
 .mysql_history
-sources/.node_repl_history
-sources/.npm/
 .profile
 .ssh/
 .viminfo
-sources/.env
-.gitconfig
-project-elaichi.json
+.gitconfig

.github/workflows/gcp-deploy.yml

@@ -0,0 +1 @@
+node_modules

.gitignore

@@ -0,0 +1,15 @@
+FROM node:alpine
+
+WORKDIR /app
+
+COPY package.json /app
+
+# COPY ./project-elaichi.json /app
+
+RUN npm install --production --force
+
+COPY . /app
+
+RUN npm install pm2 -g
+
+CMD ["pm2-runtime","start","index.js","-i","max"]

Dockerfile

@@ -1,8 +1,8 @@
 /** @format */
 
-const AccessLevels = require('../models/accessLevel.js');
-const Clubs = require('../models/club.js');
-const Users = require('../models/user.js');
+const AccessLevels = require('./accessLevel.model.js');
+const Clubs = require('../clubs/club.model.js');
+const Users = require('../users/user.model.js');
 const { DataSource } = require('apollo-datasource');
 
 class AccessLevelAPI extends DataSource {
@@ -58,15 +58,6 @@ class AccessLevelAPI extends DataSource {
 		await foundUser.save();
 		await foundClub.save();
 		return await foundAccessLevel.deleteOne();
-	}
-	
-	async deleteAccessLevelFromUser(id){
-		const foundAccessLevel= await AccessLevels.findById(id);
-		const userId = foundAccessLevel.user;
-		const foundUser = await Users.findById(userId);
-		foundUser.clubAccess = foundUser.clubAccess.filter((access)=>access._id!=id)
-		await foundUser.save();
-		return await foundAccessLevel.deleteOne();
     }
 }
 

docker-compose.yml

@@ -17,4 +17,4 @@ var accessLevelSchema = new mongoose.Schema({
     timestamps: true
 });
 
-module.exports = mongoose.model('AccessLevel', accessLevelSchema);
+module.exports = mongoose.models.AccessLevel||mongoose.model('AccessLevel', accessLevelSchema);