Merge pull request #80 from swibly/develop

Author: devkcud

.env.example

@@ -1,10 +1,18 @@
 # Postgres Config
+POSTGRES_HOST=swibly-api-db
+POSTGRES_USER=swibly
+POSTGRES_PASSWORD=123456
+POSTGRES_DATABASE=swiblydb
+POSTGRES_PORT=5432
+
 # Connection string can be found in the PSQL provider (or locally)
-POSTGRES_CONNECTION_STRING=
+POSTGRES_CONNECTION_STRING=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DATABASE}
 
 # API Config
 JWT_SECRET=jwtsecret
 ENVIRONMENT=local
+API_HOST=127.0.0.1
+API_PORT=8080
 
 # TIP: You can generate a JWT_SECRET with the command:
 # openssl rand -hex 256
@@ -19,10 +27,3 @@ SMTP_PASSWORD=
 # S3 Bucket configuration
 S3_ACCESS_KEY=
 S3_SECRET_KEY=
-
-# Local Postgres usage only
-DEBUG_POSTGRES_CONTAINER_NAME=swiblydb-container
-DEBUG_POSTGRES_HOST=localhost
-DEBUG_POSTGRES_USER=swibly
-DEBUG_POSTGRES_PASSWORD=123456
-DEBUG_POSTGRES_DATABASE=swiblydb

docker-compose.yml

@@ -1,14 +1,36 @@
 services:
+    swibly-api:
+        container_name: swibly-api
+        build:
+            context: .
+            dockerfile: Dockerfile
+        env_file:
+         - .env
+        ports:
+          - '$API_HOST:$API_PORT:8080'
+        networks:
+          - "swibly_internal"
+          - "swibly_external"
+        depends_on:
+          - "postgres"
+        restart: unless-stopped
+
     postgres:
         image: postgres:latest
-        container_name: $DEBUG_POSTGRES_CONTAINER_NAME
+        container_name: swibly-api-db
         environment:
-            POSTGRES_DB: $DEBUG_POSTGRES_DATABASE
-            POSTGRES_USER: $DEBUG_POSTGRES_USER
-            POSTGRES_PASSWORD: $DEBUG_POSTGRES_PASSWORD
+            POSTGRES_DB: $POSTGRES_DATABASE
+            POSTGRES_USER: $POSTGRES_USER
+            POSTGRES_PASSWORD: $POSTGRES_PASSWORD
         env_file:
           - .env
-        ports:
-            - '5432:5432'
         volumes:
             - ./pgdata:/var/lib/postgresql/data
+        networks:
+          - "swibly_internal"
+        restart: unless-stopped
+
+networks:
+  swibly_internal:
+    internal: true
+  swibly_external:

internal/service/repository/project.go

@@ -243,13 +243,11 @@ func (pr *projectRepository) Create(createModel *dto.ProjectCreation) (uint, err
 	}
 
 	if createModel.Fork != nil {
-		fork, err := pr.Get(createModel.OwnerID, &model.Project{ID: *createModel.Fork})
-		if err != nil {
-			tx.Rollback()
-			return 0, err
+		var userID uint
+		if err := tx.Model(&model.ProjectOwner{}).Where("project_id = ?", createModel.Fork).Pluck("user_id", userID); err != nil {
 		}
 
-		if err := tx.Create(&model.ProjectUserPermission{ProjectID: fork.ID, UserID: fork.OwnerID, Allow: dto.Allow{View: true}}).Error; err != nil {
+		if err := tx.Create(&model.ProjectUserPermission{ProjectID: project.ID, UserID: userID, Allow: dto.Allow{View: true}}).Error; err != nil {
 			tx.Rollback()
 			return 0, err
 		}