map nil struct saftey

Author: GaballaGit

internal/mapper/domain_to_dto.go

@@ -3,23 +3,23 @@ package mapper
 import (
 	"github.com/acmcsufoss/api.acmcsuf.com/internal/domain"
 
-	dto_response "github.com/acmcsufoss/api.acmcsuf.com/internal/dto/response"
+	"github.com/acmcsufoss/api.acmcsuf.com/internal/dto"
 )
 
 // File deticated to mapping domain models to dto response models
 
-func ToAnnouncementDTO(a *domain.Announcement) dto_response.Announcement {
-	return dto_response.Announcement{
+func ToAnnouncementDTO(a *domain.Announcement) dto.Announcement {
+	return dto.Announcement{
 		Uuid:             a.Uuid,
 		Visibility:       a.Visibility,
 		AnnounceAt:       a.AnnounceAt.Unix(),
-		DiscordChannelID: *a.DiscordChannelID,
-		DiscordMessageID: *a.DiscordMessageID,
+		DiscordChannelID: a.DiscordChannelID,
+		DiscordMessageID: a.DiscordMessageID,
 	}
 }
 
-func ToEventEventDTO(e *domain.Event) dto_response.Event {
-	return dto_response.Event{
+func ToEventEventDTO(e *domain.Event) dto.Event {
+	return dto.Event{
 		Uuid:     e.Uuid,
 		Location: e.Location,
 		StartAt:  e.StartAt.Unix(),
@@ -29,18 +29,18 @@ func ToEventEventDTO(e *domain.Event) dto_response.Event {
 	}
 }
 
-func ToOfficerDTO(o domain.Officer) dto_response.Officer {
-	return dto_response.Officer{
+func ToOfficerDTO(o domain.Officer) dto.Officer {
+	return dto.Officer{
 		Uuid:     o.Uuid,
 		FullName: o.FullName,
-		Picture:  *o.Picture,
-		Github:   *o.Github,
-		Discord:  *o.Discord,
+		Picture:  o.Picture,
+		Github:   o.Github,
+		Discord:  o.Discord,
 	}
 }
 
-func ToPositionDTO(p *domain.Position) dto_response.Position {
-	return dto_response.Position{
+func ToPositionDTO(p *domain.Position) dto.Position {
+	return dto.Position{
 		Oid:      p.Oid,
 		Semester: p.Semester,
 		Tier:     p.Tier,
@@ -50,11 +50,11 @@ func ToPositionDTO(p *domain.Position) dto_response.Position {
 	}
 }
 
-func ToTierDTO(t *domain.Tier) dto_response.Tier {
-	return dto_response.Tier{
+func ToTierDTO(t *domain.Tier) dto.Tier {
+	return dto.Tier{
 		Tier:   t.Tier,
-		Title:  *t.Title,
-		Tindex: *t.Tindex,
-		Team:   *t.Team,
+		Title:  t.Title,
+		Tindex: t.Tindex,
+		Team:   t.Team,
 	}
 }

internal/mapper/dto_to_domain.go

@@ -4,10 +4,14 @@ import (
 	"time"
 
 	"github.com/acmcsufoss/api.acmcsuf.com/internal/domain"
-	dto_request "github.com/acmcsufoss/api.acmcsuf.com/internal/dto/request"
+	"github.com/acmcsufoss/api.acmcsuf.com/internal/dto"
 )
 
-func ToAnnouncementDomain(a *dto_request.Announcement) domain.Announcement {
+func ToAnnouncementDomain(a *dto.Announcement) domain.Announcement {
+	if a == nil {
+		return domain.Announcement{}
+	}
+
 	return domain.Announcement{
 		Uuid:             a.Uuid,
 		Visibility:       a.Visibility,
@@ -17,11 +21,16 @@ func ToAnnouncementDomain(a *dto_request.Announcement) domain.Announcement {
 	}
 }
 
-func ToUpdateAnnouncementDomain(a *dto_request.UpdateAnnouncement) domain.UpdateAnnouncement {
+func ToUpdateAnnouncementDomain(a *dto.UpdateAnnouncement) domain.UpdateAnnouncement {
+	if a == nil {
+		return domain.UpdateAnnouncement{}
+	}
+
 	var announceAt time.Time
 	if a.AnnounceAt != nil {
 		announceAt = time.Unix(*a.AnnounceAt, 0)
 	}
+
 	return domain.UpdateAnnouncement{
 		Uuid:             a.Uuid,
 		Visibility:       a.Visibility,
@@ -31,7 +40,11 @@ func ToUpdateAnnouncementDomain(a *dto_request.UpdateAnnouncement) domain.Update
 	}
 }
 
-func ToEventDomain(e *dto_request.Event) domain.Event {
+func ToEventDomain(e *dto.Event) domain.Event {
+	if e == nil {
+		return domain.Event{}
+	}
+
 	return domain.Event{
 		Uuid:     e.Uuid,
 		Location: e.Location,
@@ -42,7 +55,11 @@ func ToEventDomain(e *dto_request.Event) domain.Event {
 	}
 }
 
-func ToUpdateEventDomain(e *dto_request.UpdateEvent) domain.UpdateEvent {
+func ToUpdateEventDomain(e *dto.UpdateEvent) domain.UpdateEvent {
+	if e == nil {
+		return domain.UpdateEvent{}
+	}
+
 	startAt := time.Unix(*e.StartAt, 0)
 	endAt := time.Unix(*e.EndAt, 0)
 	return domain.UpdateEvent{
@@ -55,7 +72,11 @@ func ToUpdateEventDomain(e *dto_request.UpdateEvent) domain.UpdateEvent {
 	}
 }
 
-func ToOfficerDomain(o *dto_request.Officer) domain.Officer {
+func ToOfficerDomain(o *dto.Officer) domain.Officer {
+	if o == nil {
+		return domain.Officer{}
+	}
+
 	return domain.Officer{
 		FullName: o.FullName,
 		Picture:  o.Picture,
@@ -64,7 +85,11 @@ func ToOfficerDomain(o *dto_request.Officer) domain.Officer {
 	}
 }
 
-func ToUpdateOfficerDomain(o *dto_request.UpdateOfficer) domain.UpdateOfficer {
+func ToUpdateOfficerDomain(o *dto.UpdateOfficer) domain.UpdateOfficer {
+	if o == nil {
+		return domain.UpdateOfficer{}
+	}
+
 	return domain.UpdateOfficer{
 		FullName: o.FullName,
 		Picture:  o.Picture,
@@ -73,7 +98,11 @@ func ToUpdateOfficerDomain(o *dto_request.UpdateOfficer) domain.UpdateOfficer {
 	}
 }
 
-func ToPositionDomain(p *dto_request.Position) domain.Position {
+func ToPositionDomain(p *dto.Position) domain.Position {
+	if p == nil {
+		return domain.Position{}
+	}
+
 	return domain.Position{
 		Oid:      p.Oid,
 		Semester: p.Semester,
@@ -84,7 +113,11 @@ func ToPositionDomain(p *dto_request.Position) domain.Position {
 	}
 }
 
-func ToUpdatePositionDomain(p *dto_request.UpdatePosition) domain.UpdatePosition {
+func ToUpdatePositionDomain(p *dto.UpdatePosition) domain.UpdatePosition {
+	if p == nil {
+		return domain.UpdatePosition{}
+	}
+
 	return domain.UpdatePosition{
 		Oid:      p.Oid,
 		Semester: p.Semester,
@@ -95,7 +128,11 @@ func ToUpdatePositionDomain(p *dto_request.UpdatePosition) domain.UpdatePosition
 	}
 }
 
-func ToTierDomain(t *dto_request.Tier) domain.Tier {
+func ToTierDomain(t *dto.Tier) domain.Tier {
+	if t == nil {
+		return domain.Tier{}
+	}
+
 	return domain.Tier{
 		Tier:   t.Tier,
 		Title:  t.Title,
@@ -104,7 +141,11 @@ func ToTierDomain(t *dto_request.Tier) domain.Tier {
 	}
 }
 
-func ToUpdateTierDomain(t *dto_request.UpdateTier) domain.UpdateTier {
+func ToUpdateTierDomain(t *dto.UpdateTier) domain.UpdateTier {
+	if t == nil {
+		return domain.UpdateTier{}
+	}
+
 	return domain.UpdateTier{
 		Tier:   t.Tier,
 		Title:  t.Title,