фиксы
All checks were successful
Create and publish a Docker image / Publish image (push) Successful in 1m24s
Create and publish a Docker image / Deploy image (push) Successful in 36s

This commit is contained in:
Vitalick Kovalenko 2023-12-23 15:08:00 +03:00
parent f3ec89dbe9
commit 63db345729
3 changed files with 46 additions and 29 deletions

View File

@ -137,7 +137,7 @@ public class MeetingsController : ControllerBase
} }
[HttpGet] [HttpGet]
public async Task<IActionResult> Get(int id) public async Task<IActionResult> Get(string id)
{ {
var meeting = await _applicationContext.Meetings.FirstOrDefaultAsync(s => s.Id == id); var meeting = await _applicationContext.Meetings.FirstOrDefaultAsync(s => s.Id == id);
@ -203,7 +203,7 @@ public class ReviewsController : ControllerBase
} }
[HttpGet] [HttpGet]
public async Task<IActionResult> Get(int id) public async Task<IActionResult> Get(string id)
{ {
var review = await _applicationContext.Reviews var review = await _applicationContext.Reviews
.Include(c => c.User) .Include(c => c.User)
@ -243,14 +243,15 @@ public class QuestionsController : ControllerBase
[HttpPost] [HttpPost]
public async Task<IActionResult> Post([FromBody] Question question) public async Task<IActionResult> Post([FromBody] PostQuestionDto question)
{ {
await _applicationContext.Questions.AddAsync(question); var dbWr = question.Adapt<Question>();
await _applicationContext.Questions.AddAsync(dbWr);
await _applicationContext.SaveChangesAsync(); await _applicationContext.SaveChangesAsync();
return Ok(new { return Ok(new {
question.Id dbWr.Id
}); });
} }
@ -268,7 +269,7 @@ public class QuestionsController : ControllerBase
} }
[HttpGet] [HttpGet]
public async Task<IActionResult> Get(int id) public async Task<IActionResult> Get(string id)
{ {
var question = await _applicationContext.Questions var question = await _applicationContext.Questions
.FirstAsync(s => s.Id == id); .FirstAsync(s => s.Id == id);
@ -320,7 +321,7 @@ public class ReactionsController : ControllerBase
} }
[HttpDelete] [HttpDelete]
public async Task<IActionResult> Delete(long id) public async Task<IActionResult> Delete(string id)
{ {
var fReview = await _applicationContext.Reactions.FirstAsync(r => r.Id == id); var fReview = await _applicationContext.Reactions.FirstAsync(r => r.Id == id);
@ -335,7 +336,7 @@ public class ReactionsController : ControllerBase
} }
[HttpGet] [HttpGet]
public async Task<IActionResult> Get(int id) public async Task<IActionResult> Get(string id)
{ {
var review = await _applicationContext.Reviews var review = await _applicationContext.Reviews
.Include(c => c.User) .Include(c => c.User)
@ -391,7 +392,7 @@ public class UserWriteToMetingController : ControllerBase
} }
[HttpDelete] [HttpDelete]
public async Task<IActionResult> Delete(long id) public async Task<IActionResult> Delete(string id)
{ {
var fReview = await _applicationContext.UserWriteToMetings.FirstAsync(r => r.Id == id); var fReview = await _applicationContext.UserWriteToMetings.FirstAsync(r => r.Id == id);
@ -406,7 +407,7 @@ public class UserWriteToMetingController : ControllerBase
} }
[HttpGet] [HttpGet]
public async Task<IActionResult> Get(int id) public async Task<IActionResult> Get(string id)
{ {
var review = await _applicationContext.UserWriteToMetings var review = await _applicationContext.UserWriteToMetings
.FirstAsync(s => s.Id == id); .FirstAsync(s => s.Id == id);

View File

@ -1,6 +1,8 @@
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations.Schema;
public class User : IdentityUser public class User : IdentityUser
{ {
@ -63,25 +65,26 @@ public class PostMeetingDto
public class UserWriteToMeting public class UserWriteToMeting
{ {
public long Id { get; set; } [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public String Id { get; set; } = null!;
public string UserId { get; set; } = null!; public String UserId { get; set; } = null!;
public long MeetingId { get; set; } public String MeetingId { get; set; } = null!;
} }
public class PostUserWriteToMetingDto public class PostUserWriteToMetingDto
{ {
public string UserId { get; set; } = null!; public String UserId { get; set; } = null!;
public long MeetingId { get; set; } public String MeetingId { get; set; } = null!;
} }
public class PutMeetingDto public class PutMeetingDto
{ {
public long Id { get; set; } public String Id { get; set; } = null!;
public DateTime Time { get; set; } public DateTime Time { get; set; }
@ -116,7 +119,8 @@ public class PutMeetingDto
public class Meeting public class Meeting
{ {
public long Id { get; set; } [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public String Id { get; set; } = null!;
public DateTime Time { get; set; } public DateTime Time { get; set; }
@ -152,9 +156,9 @@ public class Meeting
public class PostReviewDto public class PostReviewDto
{ {
public long MeetingId { get; set; } public String MeetingId { get; set; } = null!;
public string UserId { get; set; } = null!; public String UserId { get; set; } = null!;
public string Text { get; set; } = null!; public string Text { get; set; } = null!;
@ -169,7 +173,7 @@ public class PostReviewDto
public class PutReviewDto public class PutReviewDto
{ {
public long Id { get; set; } public string Id { get; set; } = null!;
public string Text { get; set; } = null!; public string Text { get; set; } = null!;
@ -181,13 +185,24 @@ public class PutReviewDto
} }
public class PostQuestionDto
{
public string Text { get; set; } = null!;
public string MeetingId { get; set; } = null!;
public string UserId { get; set; } = null!;
}
public class Question public class Question
{ {
public long Id { get; set; } [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public string Id { get; set; } = null!;
public string Text { get; set; } = null!; public string Text { get; set; } = null!;
public long MeetingId { get; set; } public string MeetingId { get; set; } = null!;
public string UserId { get; set; } = null!; public string UserId { get; set; } = null!;
} }
@ -195,9 +210,10 @@ public class Question
public class Review public class Review
{ {
public long Id { get; set; } [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public string Id { get; set; } = null!;
public long MeetingId { get; set; } public string MeetingId { get; set; } = null!;
public User User { get; set; } = null!; public User User { get; set; } = null!;
@ -217,7 +233,7 @@ public class Review
public class PostReactionDto public class PostReactionDto
{ {
public long QuestionId { get; set; } public string QuestionId { get; set; } = null!;
public string UserId { get; set; } = null!; public string UserId { get; set; } = null!;
@ -228,9 +244,10 @@ public class PostReactionDto
public class Reaction public class Reaction
{ {
public long Id { get; set; } [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public string Id { get; set; } = null!;
public long QuestionId { get; set; } public string QuestionId { get; set; } = null!;
public string UserId { get; set; } = null!; public string UserId { get; set; } = null!;
@ -265,7 +282,7 @@ public class ApplicationContext : IdentityDbContext<User>
builder.Entity<User>().HasMany<Review>().WithOne(r => r.User).HasForeignKey(c => c.UserId); builder.Entity<User>().HasMany<Review>().WithOne(r => r.User).HasForeignKey(c => c.UserId);
builder.Entity<User>().HasMany<Reaction>().WithOne().HasForeignKey(c => c.UserId); builder.Entity<User>().HasMany<Reaction>().WithOne().HasForeignKey(c => c.UserId);
builder.Entity<User>().HasMany<Question>().WithOne().HasForeignKey(c => c.UserId); builder.Entity<Question>().HasOne<Meeting>().WithMany().HasForeignKey(c => c.UserId);
builder.Entity<Question>().HasMany<Reaction>().WithOne().HasForeignKey(c => c.QuestionId); builder.Entity<Question>().HasMany<Reaction>().WithOne().HasForeignKey(c => c.QuestionId);

View File

@ -6,7 +6,6 @@
"Microsoft.AspNetCore": "Warning" "Microsoft.AspNetCore": "Warning"
} }
}, },
"AllowedHosts": "*",
"CONNECTION_STRING": "Host=localhost; Database=CyberBoomWellBeing; Username=postgres; Password=supper_password_123" "CONNECTION_STRING": "Host=localhost; Database=CyberBoomWellBeing; Username=postgres; Password=supper_password_123"