fix(link-builder): do not include entity name in base path

the entity name is used to determine the end of the base path
for example /api/v1/my-entities/1
the base path should just be /api/v1

Author: jaredcnance

src/JsonApiDotNetCore/Builders/DocumentBuilder.cs

@@ -83,8 +83,8 @@ private void _addRelationships(DocumentData data, ContextEntity contextEntity, I
                 {
                     Links = new Links
                     {
-                        Self = linkBuilder.GetSelfRelationLink(entity.Id.ToString(), r.RelationshipName),
-                        Related = linkBuilder.GetRelatedRelationLink(entity.Id.ToString(), r.RelationshipName)
+                        Self = linkBuilder.GetSelfRelationLink(contextEntity.EntityName, entity.Id.ToString(), r.RelationshipName),
+                        Related = linkBuilder.GetRelatedRelationLink(contextEntity.EntityName, entity.Id.ToString(), r.RelationshipName)
                     }
                 };
 

src/JsonApiDotNetCore/Builders/LinkBuilder.cs

@@ -26,19 +26,24 @@ private string GetNamespaceFromPath(string path, string entityName)
             var segments = path.Split('/');
 
             for(var i = 1; i < segments.Length; i++)
-                nSpace += $"/{segments[i].Dasherize()}";
+            {
+                if(segments[i].ToLower() == entityName.Dasherize()) 
+                    break;
 
+                nSpace += $"/{segments[i].Dasherize()}";
+            }
+                
             return nSpace;
         }
 
-        public string GetSelfRelationLink(string parentId, string child)
+        public string GetSelfRelationLink(string parent, string parentId, string child)
         {
-            return $"{_context.BasePath}/{parentId}/relationships/{child.Dasherize()}";
+            return $"{_context.BasePath}/{parent.Dasherize()}/{parentId}/relationships/{child.Dasherize()}";
         }
 
-        public string GetRelatedRelationLink(string parentId, string child)
+        public string GetRelatedRelationLink(string parent, string parentId, string child)
         {
-            return $"{_context.BasePath}/{parentId}/{child.Dasherize()}";
+            return $"{_context.BasePath}/{parent.Dasherize()}/{parentId}/{child.Dasherize()}";
         }
     }
 }