Release dev to master (#390)

## RecNet auto-release action
This is an auto-generated PR by recnet-release-action 🤖
Please make sure to test your changes in staging before merging. 
## Related Issues
- #392
- #371
## Related PRs
- #394
- #391
## Staging links
recnet-web:
[https://vercel.live/link/recnet-git-dev-recnet-542617e7.vercel.app](https://vercel.live/link/recnet-git-dev-recnet-542617e7.vercel.app)
recnet-api:
[https://dev-api.recnet.io/api](https://dev-api.recnet.io/api)

Author: zherujiang

apps/recnet-api/.env.sample

@@ -23,4 +23,10 @@ export SMTP_PASS="ask for password"
 export SLACK_TOKEN="ask for token" # to be deprecated
 export SLACK_CLIENT_ID="ask for client id"
 export SLACK_CLIENT_SECRET="ask for client secret"
-export SLACK_TOKEN_ENCRYPTION_KEY="ask for token encryption key"
+export SLACK_TOKEN_ENCRYPTION_KEY="ask for token encryption key"
+
+# AWS S3
+export AWS_BUCKET_NAME="ask for AWS bucket name"
+export AWS_ACCESS_KEY_ID="ask for AWS access key id"
+export AWS_SECRET_ACCESS_KEY="ask for AWS secret access key"
+export AWS_BUCKET_REGION="ask for AWS bucket region"

apps/recnet-api/.env.test

@@ -5,4 +5,10 @@ SMTP_USER=test_user
 SMTP_PASS=test_password
 SLACK_CLIENT_ID=test_client_id
 SLACK_CLIENT_SECRET=test_client_secret
-SLACK_TOKEN_ENCRYPTION_KEY=test_token_encryption_key
+SLACK_TOKEN_ENCRYPTION_KEY=test_token_encryption_key
+
+# AWS S3
+export AWS_BUCKET_NAME=test_aws_bucket_name
+export AWS_ACCESS_KEY_ID=test_aws_access_key_id
+export AWS_SECRET_ACCESS_KEY=test_aws_secret_access_key
+export AWS_BUCKET_REGION=test_aws_bucket_region

apps/recnet-api/prisma/migrations/20240505220332_create_announcement_table/down.sql

@@ -2,4 +2,4 @@
 ALTER TABLE "Announcement" DROP CONSTRAINT "Announcement_createdById_fkey";
 
 -- DropTable
-DROP TABLE "Announcement";
+DROP TABLE "Announcement";

apps/recnet-api/src/app.module.ts

@@ -9,6 +9,7 @@ import { ArticleModule } from "./modules/article/article.module";
 import { EmailModule } from "./modules/email/email.module";
 import { HealthModule } from "./modules/health/health.module";
 import { InviteCodeModule } from "./modules/invite-code/invite-code.module";
+import { PhotoStorageModule } from "./modules/photo-storage/photo-storage.module";
 import { RecModule } from "./modules/rec/rec.module";
 import { StatModule } from "./modules/stat/stat.module";
 import { SubscriptionModule } from "./modules/subscription/subscription.module";
@@ -32,6 +33,7 @@ import { LoggerMiddleware } from "./utils/middlewares/logger.middleware";
     EmailModule,
     AnnouncementModule,
     SubscriptionModule,
+    PhotoStorageModule,
   ],
   controllers: [],
   providers: [],

apps/recnet-api/src/config/common.config.ts

@@ -38,3 +38,10 @@ export const SlackConfig = registerAs("slack", () => ({
   clientSecret: parsedEnv.SLACK_CLIENT_SECRET,
   tokenEncryptionKey: parsedEnv.SLACK_TOKEN_ENCRYPTION_KEY,
 }));
+
+export const S3Config = registerAs("s3", () => ({
+  bucketName: parsedEnv.AWS_BUCKET_NAME,
+  accessKeyId: parsedEnv.AWS_ACCESS_KEY_ID,
+  secretAccessKey: parsedEnv.AWS_SECRET_ACCESS_KEY,
+  s3Region: parsedEnv.AWS_BUCKET_REGION,
+}));

apps/recnet-api/src/config/env.schema.ts

@@ -30,6 +30,11 @@ export const EnvSchema = z.object({
   SLACK_TOKEN_ENCRYPTION_KEY: z
     .string()
     .transform((val) => Buffer.from(val, "base64")),
+  // AWS S3 config
+  AWS_BUCKET_NAME: z.string(),
+  AWS_ACCESS_KEY_ID: z.string(),
+  AWS_SECRET_ACCESS_KEY: z.string(),
+  AWS_BUCKET_REGION: z.string(),
 });
 
 export const parseEnv = (env: Record<string, string | undefined>) => {

apps/recnet-api/src/database/repository/article.repository.ts

@@ -20,6 +20,15 @@ export default class ArticleRepository {
     });
   }
 
+  public async findArticleById(id: string): Promise<Article | null> {
+    return this.prisma.article.findFirst({
+      where: {
+        id: id,
+      },
+      select: article.select,
+    });
+  }
+
   public async createArticle(
     articleData: CreateArticleInput
   ): Promise<Article> {
@@ -28,4 +37,15 @@ export default class ArticleRepository {
       select: article.select,
     });
   }
+
+  public async updateArticle(
+    articleId: string,
+    data: Partial<CreateArticleInput>
+  ): Promise<Article> {
+    return this.prisma.article.update({
+      where: { id: articleId },
+      data,
+      select: article.select,
+    });
+  }
 }

apps/recnet-api/src/database/repository/article.repository.type.ts

@@ -19,6 +19,6 @@ export type CreateArticleInput = Omit<
   Article,
   "id" | "isVerified" | "abstract"
 > & {
-  abstract?: string;
+  abstract?: string | null;
   isVerified?: boolean;
 };

apps/recnet-api/src/database/repository/rec.repository.ts

@@ -173,7 +173,7 @@ export default class RecRepository {
       where.cutoff = filter.cutoff;
     } else if (filter.cutoff) {
       where.cutoff = {
-        gte: filter.cutoff.from,
+        gt: filter.cutoff.from,
         lte: filter.cutoff.to,
       };
     }

apps/recnet-api/src/modules/article/article.controller.ts

@@ -1,16 +1,34 @@
-import { Controller, Get, Query, UseFilters, UsePipes } from "@nestjs/common";
+import {
+  Body,
+  Controller,
+  Get,
+  NotFoundException,
+  Param,
+  Patch,
+  Query,
+  UseFilters,
+  UsePipes,
+} from "@nestjs/common";
 import {
   ApiOkResponse,
   ApiOperation,
   ApiTags,
   ApiBearerAuth,
 } from "@nestjs/swagger";
 
+import { AdminUpdateArticleDto } from "@recnet-api/modules/article/dto/update.article.admin.dto";
+import { UpdateArticleDto } from "@recnet-api/modules/rec/dto/update.rec.dto";
 import { Auth } from "@recnet-api/utils/auth/auth.decorator";
 import { RecnetExceptionFilter } from "@recnet-api/utils/filters/recnet.exception.filter";
-import { ZodValidationQueryPipe } from "@recnet-api/utils/pipes/zod.validation.pipe";
+import {
+  ZodValidationBodyPipe,
+  ZodValidationQueryPipe,
+} from "@recnet-api/utils/pipes/zod.validation.pipe";
 
-import { getArticlesParamsSchema } from "@recnet/recnet-api-model";
+import {
+  patchArticlesAdminRequestSchema,
+  getArticlesParamsSchema,
+} from "@recnet/recnet-api-model";
 
 import { GetArticleByLinkResponse } from "./article.response";
 import { ArticleService } from "./article.service";
@@ -25,7 +43,7 @@ export class ArticleController {
   @ApiOperation({
     summary: "Get Article By Link",
     description:
-      "Get article by link. If the article is not found in the database, it will try to get metadata using the digital library service. Now it only supports arXiv.",
+      "Get article by link. If the useDigitalLibrary option is true and article is not found in the database, it will try to get metadata using the digital library service.Otherwise it will only query from database. Now it only supports arXiv.",
   })
   @ApiOkResponse({ type: GetArticleByLinkResponse })
   @ApiBearerAuth()
@@ -35,7 +53,30 @@ export class ArticleController {
   public async getArticleByLink(
     @Query() dto: QueryArticleDto
   ): Promise<GetArticleByLinkResponse> {
-    const { link } = dto;
-    return this.articleService.getArticleByLink(link);
+    const { link, useDigitalLibraryFallback } = dto;
+    return this.articleService.getArticleByLink(
+      link,
+      useDigitalLibraryFallback
+    );
+  }
+
+  @ApiOperation({
+    summary: "Admin update article by id",
+    description: "Update an existing article's fields (title, link, etc.)",
+  })
+  @ApiOkResponse({
+    description: "Return the updated article",
+  })
+  @ApiBearerAuth()
+  @Patch("admin/:id")
+  @Auth({ allowedRoles: ["ADMIN"] })
+  @UsePipes(new ZodValidationBodyPipe(patchArticlesAdminRequestSchema))
+  public async updateArticleById(
+    @Param("id") id: string,
+    @Body() dto: AdminUpdateArticleDto
+  ) {
+    const updatedArticle = await this.articleService.updateArticleById(id, dto);
+
+    return { article: updatedArticle };
   }
 }