From df077054cfbadcf9cbff0452914aa97f72486920 Mon Sep 17 00:00:00 2001 From: yeseul106 <20191037@sungshin.ac.kr> Date: Fri, 19 Jan 2024 18:52:56 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[HOTFIX]=20prod=20=EC=84=9C=EB=B2=84?= =?UTF-8?q?=EC=97=90=20CD=20=EA=B5=AC=EC=B6=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6763832..d3ba12a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,9 +2,9 @@ name: deploy on: push: - branches: [develop] + branches: [main] pull_request: - branches: [develop] + branches: [main] jobs: build-and-deploy: @@ -29,7 +29,6 @@ jobs: pwd touch .env echo DATABASE_URL=${{ secrets.DATABASE_URL }} >>.env - echo WEBHOOK_URL=${{ secrets.WEBHOOK_URL }} >> .env echo JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }} >> .env echo MANAGER_EMAIL=${{ secrets.MANAGER_EMAIL }} >>.env echo MANAGER_PASSWORD=${{ secrets.MANAGER_PASSWORD }} >> .env @@ -37,6 +36,8 @@ jobs: echo S3_SECRET_KEY=${{ secrets.S3_SECRET_KEY }} >>.env echo S3_BUCKET=${{ secrets.S3_BUCKET }} >>.env echo TEST_ACCESS_TOKEN=${{ secrets.TEST_ACCESS_TOKEN}} >>.env + echo WEBHOOK_URL_ERROR=${{ secrets.WEBHOOK_URL_ERROR}} >>.env + ecoh WEBHOOK_URL_SIGNUP=${{ secrets.WEBHOOK_URL_SIGNUP}} >> .env cat .env - name: build server files From 4e8e3b654cc7dfa076ee21d3d7c5912178a281fd Mon Sep 17 00:00:00 2001 From: yeseul106 <68415644+yeseul106@users.noreply.github.com> Date: Fri, 19 Jan 2024 19:03:26 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[FIX]=20deploy.yml=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d3ba12a..4d02c09 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,7 +37,7 @@ jobs: echo S3_BUCKET=${{ secrets.S3_BUCKET }} >>.env echo TEST_ACCESS_TOKEN=${{ secrets.TEST_ACCESS_TOKEN}} >>.env echo WEBHOOK_URL_ERROR=${{ secrets.WEBHOOK_URL_ERROR}} >>.env - ecoh WEBHOOK_URL_SIGNUP=${{ secrets.WEBHOOK_URL_SIGNUP}} >> .env + echo WEBHOOK_URL_SIGNUP=${{ secrets.WEBHOOK_URL_SIGNUP}} >> .env cat .env - name: build server files From fd3b9dc6d34de6067178270a70d87bb730ce974e Mon Sep 17 00:00:00 2001 From: yeseul106 <20191037@sungshin.ac.kr> Date: Thu, 1 Feb 2024 21:10:35 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[FIX]=20=EC=B1=85=20=EC=9E=91=EA=B0=80=20?= =?UTF-8?q?=EA=B8=80=EC=9E=90=EC=88=98=20=EC=A6=9D=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- prisma/schema.prisma | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 5cd842d..756b3a1 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -34,11 +34,10 @@ model User { model Book { id Int @id @unique @default(autoincrement()) bookTitle String @db.VarChar(500) - author String @db.VarChar(50) + author String @db.VarChar(100) bookImage String? @db.VarChar(500) publisher String @db.VarChar(50) Bookshelf Bookshelf[] - Recommend Recommend[] } model Bookshelf { @@ -82,7 +81,6 @@ model Recommend { recommendTo Int bookId Int createdAt DateTime @default(now()) - Book Book @relation(fields: [bookId], references: [id], onDelete: Cascade, map: "recommend_book_id_fk") recommendToToUser User @relation("Recommend_recommendToToUser", fields: [recommendTo], references: [id], onDelete: Cascade, map: "recommend_user_id_fk_2") recommendedByToUser User @relation("Recommend_recommendedByToUser", fields: [recommendedBy], references: [id], onDelete: Cascade, map: "recommend_user_id_fk") RecommendAlarm RecommendAlarm[]