From a3b4bb2e3056daae58e2882748a066dcd9ead2a2 Mon Sep 17 00:00:00 2001
From: Nadegamra <63640402+Nadegamra@users.noreply.github.com>
Date: Wed, 8 Sep 2021 20:20:32 +0300
Subject: [PATCH] Mostly backend models stuff

Changed some models, did some work on database, created a class diagram.
---
 KTUSA PS/ClientApp/src/main.js                |  5 --
 KTUSA PS/ClientApp/src/pages/OidcEndpoint.vue |  2 +-
 KTUSA PS/Controllers/TestController.cs        |  5 +-
 KTUSAPS.Data/KTUSAPS.Data.csproj              |  4 --
 KTUSAPS.Data/Model/ClassDiagram1.cd           | 59 +++++++++++++++++++
 KTUSAPS.Data/Model/Issue.cs                   |  6 +-
 KTUSAPS.Data/Model/PublishedFeedback.cs       |  2 +
 KTUSAPS.Data/Model/PublishedProblem.cs        |  5 ++
 KTUSAPS.Data/Model/Solution.cs                |  2 +
 KTUSAPS.Data/Model/Vote.cs                    | 18 ++++++
 KTUSAPS.Data/SAPSDataContext.cs               | 11 +++-
 11 files changed, 105 insertions(+), 14 deletions(-)
 create mode 100644 KTUSAPS.Data/Model/ClassDiagram1.cd
 create mode 100644 KTUSAPS.Data/Model/Vote.cs

diff --git a/KTUSA PS/ClientApp/src/main.js b/KTUSA PS/ClientApp/src/main.js
index 9e53caa..5330cf5 100644
--- a/KTUSA PS/ClientApp/src/main.js	
+++ b/KTUSA PS/ClientApp/src/main.js	
@@ -3,15 +3,10 @@ import { createApp } from "vue";
 import App from "./App.vue";
 import router from "./router";
 import store from "./store";
-import BalmUI from "balm-ui"; // Official Google Material Components
-import BalmUIPlus from "balm-ui-plus"; // BalmJS Team Material Components
-import "balm-ui-css";
 
 const app = createApp(App);
 
 app.use(router);
 app.use(store);
-app.use(BalmUI);
-app.use(BalmUIPlus);
 
 app.mount("#app");
diff --git a/KTUSA PS/ClientApp/src/pages/OidcEndpoint.vue b/KTUSA PS/ClientApp/src/pages/OidcEndpoint.vue
index ff060cb..0d50517 100644
--- a/KTUSA PS/ClientApp/src/pages/OidcEndpoint.vue	
+++ b/KTUSA PS/ClientApp/src/pages/OidcEndpoint.vue	
@@ -1,6 +1,6 @@
 <template>
   <h1 @click="makeTestCall">OpenID connect return endpoint</h1>
-  {{ response }}
+  <pre style="text-align: left">{{ response }}</pre>
   {{ openIdToken }}
   <hr />
   {{ $route }}
diff --git a/KTUSA PS/Controllers/TestController.cs b/KTUSA PS/Controllers/TestController.cs
index c62b81f..13cf37d 100644
--- a/KTUSA PS/Controllers/TestController.cs	
+++ b/KTUSA PS/Controllers/TestController.cs	
@@ -15,6 +15,9 @@ namespace KTUSA_PS.Controllers
     public class TestController : ControllerBase
     {
         [HttpGet]
-        public bool Index() => true;
+        public Object[] Index()
+        {
+            return this.HttpContext.User.Claims.Select(x => new { Name = x.Type, Value= x.Value }).ToArray();
+        }
     }
 }
diff --git a/KTUSAPS.Data/KTUSAPS.Data.csproj b/KTUSAPS.Data/KTUSAPS.Data.csproj
index 6965d20..7cddda5 100644
--- a/KTUSAPS.Data/KTUSAPS.Data.csproj
+++ b/KTUSAPS.Data/KTUSAPS.Data.csproj
@@ -14,8 +14,4 @@
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Model\" />
-  </ItemGroup>
-
 </Project>
diff --git a/KTUSAPS.Data/Model/ClassDiagram1.cd b/KTUSAPS.Data/Model/ClassDiagram1.cd
new file mode 100644
index 0000000..a860c23
--- /dev/null
+++ b/KTUSAPS.Data/Model/ClassDiagram1.cd
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+  <Class Name="KTUSAPS.Data.Model.Issue">
+    <Position X="0.75" Y="1.25" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAACAAJAACAgAAAAAAACAAgIAAEAAAQAAAAAAAAAAAA=</HashCode>
+      <FileName>Model\Issue.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Property Name="Feedback" />
+      <Property Name="Problem" />
+    </ShowAsAssociation>
+  </Class>
+  <Class Name="KTUSAPS.Data.Model.PublishedFeedback">
+    <Position X="3.75" Y="3.75" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAECAAAAAAAAAAAACAIAAAAAAAAAAAQAEAAAAAAAAAA=</HashCode>
+      <FileName>Model\PublishedFeedback.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Property Name="Issue" />
+    </ShowAsAssociation>
+  </Class>
+  <Class Name="KTUSAPS.Data.Model.PublishedProblem">
+    <Position X="3.75" Y="0.5" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>ACECABAAAAEAAAgAAAABAAAAEAAAQAQAEAAAAAAAAAA=</HashCode>
+      <FileName>Model\PublishedProblem.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Property Name="Solution" />
+      <Property Name="Issue" />
+    </ShowAsAssociation>
+    <ShowAsCollectionAssociation>
+      <Property Name="Votes" />
+    </ShowAsCollectionAssociation>
+  </Class>
+  <Class Name="KTUSAPS.Data.Model.Solution">
+    <Position X="6.5" Y="0.5" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAACAAIABAAAAQAAAAAAAAAAAAAAAAQAAAAAAAAAAAA=</HashCode>
+      <FileName>Model\Solution.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Property Name="Problem" />
+    </ShowAsAssociation>
+  </Class>
+  <Class Name="KTUSAPS.Data.Model.Vote">
+    <Position X="6.5" Y="2.25" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAIAAAAAEAAAAAAAAAgAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>Model\Vote.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Property Name="Problem" />
+    </ShowAsAssociation>
+  </Class>
+  <Font Name="Segoe UI" Size="9" />
+</ClassDiagram>
\ No newline at end of file
diff --git a/KTUSAPS.Data/Model/Issue.cs b/KTUSAPS.Data/Model/Issue.cs
index 62abc53..40dcaf0 100644
--- a/KTUSAPS.Data/Model/Issue.cs
+++ b/KTUSAPS.Data/Model/Issue.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -9,8 +10,10 @@ namespace KTUSAPS.Data.Model
 {
     public class Issue
     {
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int Id { get; set; }
-
+        [MaxLength(64)]
+        public string UserID { get; set; }
         public string Email { get; set; }
         public bool Anonimous { get; set; }
         public bool Publishable { get; set; }
@@ -20,5 +23,6 @@ namespace KTUSAPS.Data.Model
         public string Description { get; set; }
 
         public PublishedProblem Problem { get; set; }
+        public PublishedFeedback Feedback { get; set; }
     }
 }
diff --git a/KTUSAPS.Data/Model/PublishedFeedback.cs b/KTUSAPS.Data/Model/PublishedFeedback.cs
index 2a1a14b..9d23659 100644
--- a/KTUSAPS.Data/Model/PublishedFeedback.cs
+++ b/KTUSAPS.Data/Model/PublishedFeedback.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -9,6 +10,7 @@ namespace KTUSAPS.Data.Model
 {
     public class PublishedFeedback
     {
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int Id { get; set; }
         [Required]
         [MaxLength]
diff --git a/KTUSAPS.Data/Model/PublishedProblem.cs b/KTUSAPS.Data/Model/PublishedProblem.cs
index fdae1f9..35f1fb7 100644
--- a/KTUSAPS.Data/Model/PublishedProblem.cs
+++ b/KTUSAPS.Data/Model/PublishedProblem.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -9,6 +10,7 @@ namespace KTUSAPS.Data.Model
 {
     public class PublishedProblem
     {
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int Id { get; set; }
         [Required]
         [MaxLength]
@@ -28,5 +30,8 @@ namespace KTUSAPS.Data.Model
 
         public int? SolutionId { get; set; }
         public Solution Solution { get; set; }
+        public ICollection<Vote> Votes { get; set; }
+
+
     }
 }
diff --git a/KTUSAPS.Data/Model/Solution.cs b/KTUSAPS.Data/Model/Solution.cs
index c66cce9..4bccc18 100644
--- a/KTUSAPS.Data/Model/Solution.cs
+++ b/KTUSAPS.Data/Model/Solution.cs
@@ -1,10 +1,12 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace KTUSAPS.Data.Model
 {
     public class Solution
     {
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int Id { get; set; }
         [MaxLength]
         public string SolutionLt { get; set; }
diff --git a/KTUSAPS.Data/Model/Vote.cs b/KTUSAPS.Data/Model/Vote.cs
new file mode 100644
index 0000000..a794667
--- /dev/null
+++ b/KTUSAPS.Data/Model/Vote.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KTUSAPS.Data.Model
+{
+    public class Vote
+    {
+        [MaxLength(64)]
+        public string UserId { get; set; }
+        public int ProblemId { get; set; }
+        public PublishedProblem Problem { get; set; }
+
+    }
+}
diff --git a/KTUSAPS.Data/SAPSDataContext.cs b/KTUSAPS.Data/SAPSDataContext.cs
index d8efd39..083e8ff 100644
--- a/KTUSAPS.Data/SAPSDataContext.cs
+++ b/KTUSAPS.Data/SAPSDataContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using KTUSAPS.Data.Model;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,7 +14,8 @@ namespace KTUSAPS.Data
         public SAPSDataContext(DbContextOptions options) : base(options) { }
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
-
+            modelBuilder.Entity<Vote>()
+                .HasKey(v => new { v.UserId, v.ProblemId });
         }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
@@ -24,6 +26,11 @@ namespace KTUSAPS.Data
             }
         }
 
+        public DbSet<Issue> Issues { get; set; }
+        public DbSet<PublishedFeedback> PublishedFeedbacks { get; set; }
+        public DbSet<PublishedProblem> PublishedProblems { get; set; }
+        public DbSet<Solution> Solutions { get; set; }
+        public DbSet<Vote> Votes { get; set; }
 
     }
 }