Skip to content

Commit d3bf7a8

Browse files
S3Client
1 parent 0055763 commit d3bf7a8

12 files changed

+17
-9
lines changed

.vs/WebApplicationBeanstalk/v16/.suo

512 Bytes
Binary file not shown.

Controllers/HomeController.cs

+11-7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Security.Cryptography.X509Certificates;
66
using System.Threading.Tasks;
77
using Amazon.DynamoDBv2;
8+
using Amazon.S3;
89
using Microsoft.AspNetCore.Identity.UI.Pages.Account.Internal;
910
using Microsoft.AspNetCore.Mvc;
1011
using WebApplicationBeanstalk.Models;
@@ -16,9 +17,12 @@ public class HomeController : Controller
1617
{
1718
private IAmazonDynamoDB dynamoDBClient;
1819

19-
public HomeController(IAmazonDynamoDB dynamoDBClient)
20+
private IAmazonS3 s3Client;
21+
22+
public HomeController(IAmazonDynamoDB dynamoDBClient,IAmazonS3 s3Client)
2023
{
2124
this.dynamoDBClient = dynamoDBClient;
25+
this.s3Client = s3Client;
2226
}
2327

2428
public IActionResult Index()
@@ -34,7 +38,7 @@ public IActionResult RegistrationForm()
3438
[HttpPost]
3539
public IActionResult LogIn (string email, string password)
3640
{
37-
AWSServices services = new AWSServices(dynamoDBClient);
41+
AWSServices services = new AWSServices(dynamoDBClient, s3Client);
3842
User user = services.LogIn(email, password).Result;
3943

4044
if (user == null)
@@ -48,7 +52,7 @@ public IActionResult LogIn (string email, string password)
4852
[HttpGet]
4953
public IActionResult Movies(string email)
5054
{
51-
AWSServices services = new AWSServices(dynamoDBClient);
55+
AWSServices services = new AWSServices(dynamoDBClient, s3Client);
5256
return View("Movies", new UserXMovies()
5357
{
5458
User = services.GetUser(email).Result,
@@ -60,7 +64,7 @@ public IActionResult Movies(string email)
6064
[HttpGet]
6165
public IActionResult MoviesDetails(string email, string movieId)
6266
{
63-
AWSServices services = new AWSServices(dynamoDBClient);
67+
AWSServices services = new AWSServices(dynamoDBClient, s3Client);
6468
return View("MoviesDetails", new UserXMovie()
6569
{
6670
User = services.GetUser(email).Result,
@@ -71,7 +75,7 @@ public IActionResult MoviesDetails(string email, string movieId)
7175
[HttpGet]
7276
public ActionResult DownloadMovie(string Id)
7377
{
74-
AWSServices services = new AWSServices(dynamoDBClient);
78+
AWSServices services = new AWSServices(dynamoDBClient, s3Client);
7579
string Tmp = AppDomain.CurrentDomain.BaseDirectory;
7680
Movie movie = services.GetMovie(Id, true).Result;
7781
return PhysicalFile(Tmp + movie.Id + movie.Video.GetType(), "video/avi", movie.Title);
@@ -80,7 +84,7 @@ public ActionResult DownloadMovie(string Id)
8084
[HttpPost]
8185
public IActionResult AddComment(string email, string movieId, string comment,int rate)
8286
{
83-
AWSServices services = new AWSServices(dynamoDBClient);
87+
AWSServices services = new AWSServices(dynamoDBClient, s3Client);
8488
services.AddComment(email, movieId, comment, rate);
8589
return MoviesDetails(email, movieId);
8690
}
@@ -89,7 +93,7 @@ public IActionResult AddComment(string email, string movieId, string comment,int
8993
[HttpPost]
9094
public IActionResult AddUser (User user)
9195
{
92-
AWSServices services = new AWSServices(dynamoDBClient);
96+
AWSServices services = new AWSServices(dynamoDBClient, s3Client);
9397
if (ModelState.IsValid)
9498
{
9599
User newUser = services.Register(user).Result;

Service/AWSServices.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Amazon.DynamoDBv2;
88
using Amazon.DynamoDBv2.DataModel;
99
using Amazon.DynamoDBv2.Model;
10+
using Amazon.S3;
1011

1112
namespace WebApplicationBeanstalk.Service
1213
{
@@ -16,10 +17,12 @@ public class AWSServices
1617
RegionEndpoint Region = RegionEndpoint.CACentral1;
1718

1819
IAmazonDynamoDB dynamoDBClient { get; set; }
20+
IAmazonS3 s3Client { get; set; }
1921

20-
public AWSServices(IAmazonDynamoDB dynamoDBClient)
22+
public AWSServices(IAmazonDynamoDB dynamoDBClient, IAmazonS3 s3Client)
2123
{
2224
this.dynamoDBClient = dynamoDBClient;
25+
this.s3Client = s3Client;
2326
CreateTable();
2427
}
2528
public async Task<User> Register(User user)

Startup.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Linq;
44
using System.Threading.Tasks;
55
using Amazon.DynamoDBv2;
6+
using Amazon.S3;
67
using Microsoft.AspNetCore.Builder;
78
using Microsoft.AspNetCore.Hosting;
89
using Microsoft.AspNetCore.Http;
@@ -33,7 +34,7 @@ public void ConfigureServices(IServiceCollection services)
3334

3435
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
3536
services.AddDefaultAWSOptions(Configuration.GetAWSOptions());
36-
// services.AddAWSService<IAmazonS3>();
37+
services.AddAWSService<IAmazonS3>();
3738
services.AddAWSService<IAmazonDynamoDB>();
3839
}
3940

Binary file not shown.
Binary file not shown.
512 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
512 Bytes
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)