Merge remote-tracking branch 'origin/master' into DtoBuilders

instead of event title and organizer, we now also show place and date

WebApp/DTOs/EventSummaryDto.cs

@@ -12,8 +12,8 @@ public record class EventSummaryDto {
     [StringLength(500)] public string Description { get; set; }
     [Required] [StringLength(100)] public string Location { get; set; }
     [Required] public DateTime? EventDate { get; set; }
-    public ICollection<EventSkill> EventSkills { get; set; }
-    public ICollection<EventRegistration> EventRegistrations { get; set; }
+    public ICollection<SkillSummaryDto> EventSkills { get; set; }
+    public ICollection<EventRegistrationDto> EventRegistrations { get; set; }
 
 
 };

WebApp/Endpoints/AuthEndpoints.cs

@@ -229,7 +229,7 @@ namespace WebApp.Endpoints
                     .Include(vs => vs.Skill)
                     .Select(vs => new
                     {
-                        skillId = vs.Skill.SkillId,
+                        skillId = vs.Skill!.SkillId,
                         skillName = vs.Skill.Name
                     })
                     .ToListAsync();

WebApp/Endpoints/EventsEndpoints.cs

@@ -20,27 +20,24 @@ namespace WebApp.Endpoints
 
             // GET /events
             group.MapGet("/",
-                async (ApplicationDbContext dbContext, HttpContext httpContext) =>
+                async (ApplicationDbContext dbContext, HttpContext httpContext, GeneralUseHelpers guhf) =>
             {
 
-                var sort = httpContext.Request.Query["sort"].ToString();
-                IOrderedQueryable<Event> res;
-                var r = dbContext.Events
-                           .Include(Eve => Eve.Organisation);
+                // Sprawdź, czy lista powinna by posortowana rosnąco. Domyślnie: malejąco.
+                var sort = httpContext.Request.Query["sort"].ToString().ToUpper();
 
-                if (sort is not null && sort.ToUpper() == "ASC")
-                {
-                    res = r.OrderBy(Eve => Eve.EventId);
-                }
-                else
-                {
-                    res = r.OrderByDescending(Eve => Eve.EventId);
-                }
+                // Sprawdź, czy token należy do organizacji, a jeżeli tak, to do której.
+                Token? token = await guhf.GetTokenFromHTTPContext(httpContext);
+                Organisation? org = await guhf.GetOrganisationFromToken(token);
+
+                List<EventSummaryDto> result = await guhf.BuildSummaryEventsDto(
+                    dbContext,
+                    org,
+                    (sort == "ASC")
+                );
+
+                return Results.Ok(result);
 
-                    return await res
-                           .Select(Eve => Eve.ToEventSummaryDto()) //EventSummaryDto
-                           .AsNoTracking()
-                           .ToListAsync();
             });
 
 
@@ -64,7 +61,7 @@ namespace WebApp.Endpoints
                 // puste pole.
                 List<EventDetailsDto> result = await guhf.BuildDetailedEventsDto(
                     dbContext,
-                    (org is not null && Eve.Organisation == org)
+                    org
                 );
 
                 return Results.Ok(result.FirstOrDefault(e => e.EventId == id));
@@ -158,20 +155,14 @@ namespace WebApp.Endpoints
                 {
 
                     // Uzyskaj organizację z tokenu
-                    var sort = httpContext.Request.Query["sort"].ToString();
+                    var sort = httpContext.Request.Query["sort"].ToString().ToUpper();
                     Token? token = await guhf.GetTokenFromHTTPContext(httpContext);
                     Organisation? org = await guhf.GetOrganisationFromToken(token);
+                    List<EventSummaryDto> SearchCandidates = await guhf.BuildSummaryEventsDto(dbContext, org, sort == "ASC");
                     List<EventSummaryDto> SearchResults = [];
 
-                    
-                    List<Event> AllEvents = await dbContext.Events.ToListAsync();
-                    if (sort is null || sort.ToUpper() != "ASC")
-                    {
-                        AllEvents.Reverse(); // aby wyświetlało od najnowszych wydarzeń
 
-                    }
-
-                    foreach(Event e in AllEvents)
+                    foreach(EventSummaryDto e in SearchCandidates)
                     {
                         bool matchFound = true;
                         // Logika wyszukiwania
@@ -184,19 +175,19 @@ namespace WebApp.Endpoints
 
                         if (query.TitleOrDescription is not null)
                         {
-                            var TitleMatch = guhf.SearchString(e.Title, query.TitleOrDescription);
+                            var TitleMatch = guhf.SearchString(e.Title,       query.TitleOrDescription);
                             var DescMatch  = guhf.SearchString(e.Description, query.TitleOrDescription);
                             if (!TitleMatch && !DescMatch) matchFound = false;
                         }
 
 
-                        //Zakres dat do wyszukiwania
-                        if(query.EventDateFrom is not null)
+                        // Zakres dat do wyszukiwania
+                        if (query.EventDateFrom is not null)
                         {
                             if (e.EventDate < query.EventDateFrom) matchFound = false;
 
                         }
-                        if(query.EventDateTo is not null)
+                        if (query.EventDateTo is not null)
                         {
                             if (e.EventDate > query.EventDateTo) matchFound = false;
                         }
@@ -210,19 +201,12 @@ namespace WebApp.Endpoints
                         // Uwaga! Zanim to zrobisz, sprawdź, czy użytkownik
                         // jest twórcą danego wydarzenia! Jeżeli nim nie jest,
                         // wyzeruj EventRegistrations!
-                        if (org is null || e.Organisation != org)
+                        if (org is null || e.OrganisationId != org.OrganisationId)
                         {
                             e.EventRegistrations.Clear();
                         }
 
-                        // UWAGA! TO NIE POWINNO TAK DZIAŁAĆ!
-                        // KTOKOLWIEK WIDZIAŁ, KTOKOLWIEK WIE CZEMU Organisation JEST null?
-                        //
-                        // Odpowiedź: Bo pobieramy dane bez .Include(e => e.Organisation),
-                        // co zapobiega masie innych problemów, m.in. rekurencyjnym importom.
-                        e.Organisation = await guhf.GetOrganisationFromId(e.OrganisationId);
-
-                        if (matchFound) SearchResults.Add(e.ToEventSummaryDto());
+                        if (matchFound) SearchResults.Add(e);
                     }
 
                     return Results.Ok(SearchResults);

WebApp/Endpoints/GeneralUseHelperFunctions.cs

@@ -36,12 +36,7 @@ public class GeneralUseHelpers
         User? user = await GetUserFromToken(t);
         if (user is not null && user.IsOrganisation)
         {
-            Organisation? org = await _context.Organisations.FirstOrDefaultAsync(o => o.UserId == t.UserId);
-
-            if (org is null)
-            {
-                Console.WriteLine("!!!");
-            }
+            Organisation? org = await _context.Organisations.FirstOrDefaultAsync(o => o.UserId == t!.UserId);
 
             return org;
         }
@@ -114,36 +109,26 @@ public class GeneralUseHelpers
         return words.Any(word => word.Contains(searchTerm, StringComparison.OrdinalIgnoreCase));
     }
 
-    public async Task<List<EventDetailsDto>> BuildDetailedEventsDto(ApplicationDbContext context, bool includeEventRegistrations = false)
+    public async Task<List<EventDetailsDto>> BuildDetailedEventsDto(
+        ApplicationDbContext context,
+        Organisation? org,
+        bool sortAscending = false)
     {
         // https://khalidabuhakmeh.com/ef-core-and-aspnet-core-cycle-issue-and-solution
 
         // Jeśli token należy do organizacji, która utworzyła to wydarzenie,
         // to zwróć także EventRegistrations. W przeciwnym razie niech będzie to
         // puste pole.
-        ICollection<EventRegistrationDto> ERs = new List<EventRegistrationDto>();
-        if (includeEventRegistrations)
-        {
-            ERs = await context
-                .EventRegistrations
-                .Select(er => new EventRegistrationDto
-                {
-                    EventId = er.EventId,
-                    UserId = er.UserId,
-                    UserName = er.User.FirstName + " " + er.User.LastName,
-                    RegisteredAt = er.RegisteredAt
-                }).ToListAsync();
-        }
 
-        List<EventDetailsDto> result = await context
+        IQueryable<EventDetailsDto> result_iq = context
                 .Events
                 .Select(e => new EventDetailsDto
                 {
                     EventId = e.EventId,
                     OrganisationId = e.OrganisationId,
-                    OrganisationName = e.Organisation.Name,
+                    OrganisationName = e.Organisation!.Name,
                     Title = e.Title,
-                    Description = e.Description,
+                    Description = e.Description ?? "",
                     Location = e.Location,
                     EventDate = e.EventDate,
                     EventSkills = e
@@ -151,11 +136,69 @@ public class GeneralUseHelpers
                         .Select(es => new SkillSummaryDto
                         {
                             SkillId = es.SkillId,
-                            SkillName = es.Skill.Name
+                            SkillName = es.Skill!.Name
                         }).ToList(),
-                    EventRegistrations = ERs
-                }).ToListAsync();
+                    EventRegistrations = e.Organisation == org ?
+                        e.EventRegistrations
+                        .Select(er => new EventRegistrationDto
+                        {
+                            EventId = er.EventId,
+                            UserId = er.UserId,
+                            UserName = er.User!.FirstName + " " + er.User.LastName,
+                            RegisteredAt = er.RegisteredAt
+                        }).ToList() : null!
+                });
 
-        return result;
+        if (sortAscending) result_iq = result_iq.OrderBy(e => e.EventId);
+        else               result_iq = result_iq.OrderByDescending(e => e.EventId);
+
+
+        return await result_iq.ToListAsync();
     }
+
+    public async Task<List<EventSummaryDto>> BuildSummaryEventsDto(
+        ApplicationDbContext context,
+        Organisation? org,
+        bool sortAscending = false)
+    {
+        // https://khalidabuhakmeh.com/ef-core-and-aspnet-core-cycle-issue-and-solution
+
+        // Jeśli token należy do organizacji, która utworzyła to wydarzenie,
+        // to zwróć także EventRegistrations. W przeciwnym razie niech będzie to
+        // puste pole.
+        IQueryable<EventSummaryDto> result_iq = context
+                .Events
+                .Select(e => new EventSummaryDto
+                {
+                    EventId = e.EventId,
+                    OrganisationId = e.OrganisationId,
+                    Organisation = e.Organisation!.Name,
+                    Title = e.Title,
+                    Description = e.Description ?? "",
+                    Location = e.Location,
+                    EventDate = e.EventDate,
+                    EventSkills = e
+                        .EventSkills
+                        .Select(es => new SkillSummaryDto
+                        {
+                            SkillId = es.SkillId,
+                            SkillName = es.Skill!.Name
+                        }).ToList(),
+                    EventRegistrations = e.Organisation == org ?
+                        e.EventRegistrations
+                        .Select(er => new EventRegistrationDto
+                        {
+                            EventId = er.EventId,
+                            UserId = er.UserId,
+                            UserName = er.User!.FirstName + " " + er.User.LastName,
+                            RegisteredAt = er.RegisteredAt
+                        }).ToList() : null!
+                });
+
+        if (sortAscending) result_iq = result_iq.OrderBy(e => e.EventId);
+        else               result_iq = result_iq.OrderByDescending(e => e.EventId);
+
+        return await result_iq.ToListAsync();
+    }
+
 }

WebApp/Mapping/EventMapping.cs

@@ -34,16 +34,30 @@ public static class EventMapping
 
     public static EventSummaryDto ToEventSummaryDto(this Event myEvent)
     {
+
+        List<SkillSummaryDto>      ssdto = new List<SkillSummaryDto>();
+        List<EventRegistrationDto> erdto = new List<EventRegistrationDto>();
+
+        foreach (EventSkill es in myEvent.EventSkills)
+        {
+            ssdto.Add(es.ToSkillSummaryDto());
+        }
+
+        foreach (EventRegistration er in myEvent.EventRegistrations)
+        {
+            erdto.Add(er.ToEventRegistrationDto());
+        }
+
         return new EventSummaryDto {
             EventId            = myEvent.EventId,
             Organisation       = myEvent.Organisation!.Name,
             OrganisationId     = myEvent.OrganisationId,
             Title              = myEvent.Title,
-            Description        = myEvent.Description,
+            Description        = myEvent.Description ?? "",
             Location           = myEvent.Location,
             EventDate          = myEvent.EventDate,
-            EventSkills        = myEvent.EventSkills,
-            EventRegistrations = myEvent.EventRegistrations
+            EventSkills        = ssdto,
+            EventRegistrations = erdto
         };
     }
     public static EventSummaryNoErDto ToEventSummaryNoErDto(this Event myEvent)
@@ -54,7 +68,7 @@ public static class EventMapping
             myEvent.Organisation!.Name,
             myEvent.OrganisationId,
             myEvent.Title,
-            myEvent.Description,
+            myEvent.Description ?? "",
             myEvent.Location,
             myEvent.EventDate,
             myEvent.EventSkills
@@ -67,7 +81,7 @@ public static class EventMapping
         return new EventRegistrationDto {
             EventId      = myER.EventId,
             UserId       = myER.UserId,
-            UserName     = myER.User.FirstName + " " + myER.User.LastName,
+            UserName     = myER.User!.FirstName + " " + myER.User!.LastName,
             RegisteredAt = myER.RegisteredAt
         };
     }
@@ -90,9 +104,9 @@ public static class EventMapping
         return new EventDetailsDto {
             EventId            = myEvent.EventId,
             OrganisationId     = myEvent.OrganisationId,
-            OrganisationName   = myEvent.Organisation.Name,
+            OrganisationName   = myEvent.Organisation!.Name,
             Title              = myEvent.Title,
-            Description        = myEvent.Description,
+            Description        = myEvent.Description ?? "",
             Location           = myEvent.Location,
             EventDate          = myEvent.EventDate,
             EventSkills        = ssdto,

WebApp/Mapping/EventRegistrationMapping.cs

@@ -1,17 +0,0 @@
-using WebApp.DTOs;
-using WebApp.Entities;
-
-namespace WebApp.Mapping
-{
-    public static class EventRegistrationMapping
-    {
-        public static EventRegistrationDto ToEventRegistrationDto(this EventRegistration er)
-        {
-            return new EventRegistrationDto(
-                er.EventId,
-                er.UserId,
-                er.RegisteredAt
-            );
-        }
-    }
-}

WebApp/ts/eventList.ts

@@ -1,4 +1,4 @@
-import { getEvent, getMyAccount, unhideElementById } from './generalUseHelpers.js';
+import { getEvent, getMyAccount, unhideElementById } from './generalUseHelpers.js';
 
 var isAscending: boolean = false;
 
@@ -57,10 +57,17 @@ async function loadEvents(org_id: number, evs?: Promise<any>) {
             //card.innerHTML = `
             //    <span>${ev.title}</span>`
             // Do odkomentowania kiedy widok podglądu wydarzeń będzie gotowy
+            let formattedDate: string = new Intl.DateTimeFormat('en-US', {
+                weekday: 'long', // "Monday"
+                year: 'numeric', // "2023"
+                month: 'long', // "December"
+                day: 'numeric' // "1"
+            }).format(ev.eventDate);
+            console.log(formattedDate);
             card.innerHTML = `
                 <span>
                     <a href="/view.html?event=${ev.eventId}" style="color: #2898BD">${ev.title}</a>
-                    <p style="margin: 0">${ev.organisation}</p>
+                    <p style="margin: 0">${ev.organisation} | ${ev.location} | ${formattedDate}</p>
                 </span>`
             if (org_id == ev.organisationId) {
                 card.innerHTML += `
@@ -118,4 +125,4 @@ document.addEventListener("DOMContentLoaded", async () => {
             loadEvents(org_id, searchResults);
         }
     })
-});
+});

WebApp/ts/eventView.ts

@@ -59,14 +59,21 @@ document.addEventListener("DOMContentLoaded", async () => {
             unhideElementById(document, "removeBtn");
         } else if (org_id == -1) {
             // Użytkownik jest wolontariuszem
-            const registeredIds = await getMyRegisteredEventIds();
-            const isRegistered = registeredIds.includes(Number(eventId));
+            try {
+                const registeredIds = await getMyRegisteredEventIds();
+                const isRegistered = registeredIds.includes(Number(eventId));
 
-            if (isRegistered) {
-                unhideElementById(document, "leaveBtn");
-            } else {
+                if (isRegistered) {
+                    unhideElementById(document, "leaveBtn");
+                } else {
+                    unhideElementById(document, "applyBtn");
+                }
+            } catch {
                 unhideElementById(document, "applyBtn");
+                (applyBtn as HTMLButtonElement).textContent = "log in to apply";
+                (applyBtn as HTMLButtonElement).disabled = true;
             }
+            
         }
 
         unhideElementById(document, "mainContainer");

WebApp/ts/generalUseHelpers.ts

@@ -36,7 +36,7 @@ export async function getEvent(id: string): Promise<EventData> {
 export async function getMyAccount(): Promise<MyAccount> {
     const res = await fetch("/api/auth/my_account");
     if (!res.ok) {
-        throw Error("U<EFBFBD>ytkownik niezalogowany!");
+        throw Error("Użytkownik niezalogowany!");
     }
     const data = await res.json();
     return data;

WebApp/wwwroot/js/eventList.js

@@ -59,13 +59,18 @@ function loadEvents(org_id, evs) {
             for (const ev of events) {
                 const card = document.createElement("div");
                 card.className = "event-card filled";
-                //card.innerHTML = `
-                //    <span>${ev.title}</span>`
-                // Do odkomentowania kiedy widok podglądu wydarzeń będzie gotowy
+
+                let formattedDate = new Intl.DateTimeFormat('en-US', {
+                    weekday: 'long',
+                    year: 'numeric',
+                    month: 'long',
+                    day: 'numeric' // "1"
+                }).format(new Date(ev.eventDate));
+
                 card.innerHTML = `
                 <span>
                     <a href="/view.html?event=${ev.eventId}" style="color: #2898BD">${ev.title}</a>
-                    <p style="margin: 0">${ev.organisation}</p>
+                    <p style="margin: 0">👥 ${ev.organisation} | 📍 ${ev.location} | 📅 ${formattedDate}</p>
                 </span>`;
                 if (org_id == ev.organisationId) {
                     card.innerHTML += `

WebApp/wwwroot/js/eventView.js

@@ -65,13 +65,20 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
         }
         else if (org_id == -1) {
             // Użytkownik jest wolontariuszem
-            const registeredIds = yield getMyRegisteredEventIds();
-            const isRegistered = registeredIds.includes(Number(eventId));
-            if (isRegistered) {
-                unhideElementById(document, "leaveBtn");
+            try {
+                const registeredIds = yield getMyRegisteredEventIds();
+                const isRegistered = registeredIds.includes(Number(eventId));
+                if (isRegistered) {
+                    unhideElementById(document, "leaveBtn");
+                }
+                else {
+                    unhideElementById(document, "applyBtn");
+                }
             }
-            else {
+            catch (_b) {
                 unhideElementById(document, "applyBtn");
+                applyBtn.textContent = "log in to apply";
+                applyBtn.disabled = true;
             }
         }
         unhideElementById(document, "mainContainer");
@@ -107,33 +114,9 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
     }
     if (applyBtn) {
         applyBtn.addEventListener("click", (e) => __awaiter(void 0, void 0, void 0, function* () {
-            var _b;
-            try {
-                const response = yield fetch(`/api/events/join/${eventId}`, {
-                    method: "POST",
-                    headers: {
-                        "Content-Type": "application/json"
-                    },
-                });
-                const result = yield response.json();
-                if (result.success) {
-                    window.location.href = `/view.html?event=${eventId}`;
-                }
-                else {
-                    alert(`Error: ${(_b = result.error_msg) !== null && _b !== void 0 ? _b : "Unknown error occurred."}`);
-                }
-            }
-            catch (error) {
-                console.error("Failed to apply:", error);
-                alert("Failed to apply.");
-            }
-        }));
-    }
-    if (leaveBtn) {
-        leaveBtn.addEventListener("click", (e) => __awaiter(void 0, void 0, void 0, function* () {
             var _c;
             try {
-                const response = yield fetch(`/api/events/leave/${eventId}`, {
+                const response = yield fetch(`/api/events/join/${eventId}`, {
                     method: "POST",
                     headers: {
                         "Content-Type": "application/json"
@@ -147,6 +130,30 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
                     alert(`Error: ${(_c = result.error_msg) !== null && _c !== void 0 ? _c : "Unknown error occurred."}`);
                 }
             }
+            catch (error) {
+                console.error("Failed to apply:", error);
+                alert("Failed to apply.");
+            }
+        }));
+    }
+    if (leaveBtn) {
+        leaveBtn.addEventListener("click", (e) => __awaiter(void 0, void 0, void 0, function* () {
+            var _d;
+            try {
+                const response = yield fetch(`/api/events/leave/${eventId}`, {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json"
+                    },
+                });
+                const result = yield response.json();
+                if (result.success) {
+                    window.location.href = `/view.html?event=${eventId}`;
+                }
+                else {
+                    alert(`Error: ${(_d = result.error_msg) !== null && _d !== void 0 ? _d : "Unknown error occurred."}`);
+                }
+            }
             catch (error) {
                 console.error("Failed to leave:", error);
                 alert("Failed to leave.");

WebApp/wwwroot/js/generalUseHelpers.js

@@ -29,7 +29,7 @@ export function getMyAccount() {
     return __awaiter(this, void 0, void 0, function* () {
         const res = yield fetch("/api/auth/my_account");
         if (!res.ok) {
-            throw Error("U<EFBFBD>ytkownik niezalogowany!");
+            throw Error("Użytkownik niezalogowany!");
         }
         const data = yield res.json();
         return data;