Merge remote-tracking branch 'origin/master'

svc/queries/productattributes.go

@@ -1,14 +1,19 @@
 package queries
 
 const GetProductAttributes = `
-;WITH TypeDesc AS (
+;WITH RequiredTypes AS (
 	SELECT
 		t.ItemTypeCode,
 		t.AttributeTypeCode,
-		ISNULL(t.AttributeTypeDescription, CAST(t.AttributeTypeCode AS NVARCHAR(30))) AS AttributeTypeDescription
-	FROM dbo.cdItemAttributeTypeDesc AS t WITH(NOLOCK)
+		ISNULL(NULLIF(td.AttributeTypeDescription, ''), CAST(t.AttributeTypeCode AS NVARCHAR(30))) AS AttributeTypeDescription
+	FROM dbo.cdItemAttributeType AS t WITH(NOLOCK)
+	LEFT JOIN dbo.cdItemAttributeTypeDesc AS td WITH(NOLOCK)
+		ON td.ItemTypeCode = t.ItemTypeCode
+		AND td.AttributeTypeCode = t.AttributeTypeCode
+		AND td.LangCode = 'TR'
 	WHERE t.ItemTypeCode = @p1
-	  AND t.LangCode = 'TR'
+	  AND ISNULL(t.IsBlocked, 0) = 0
+	  AND ISNULL(t.IsRequired, 0) = 1
 ),
 Attr AS (
 	SELECT
@@ -24,19 +29,21 @@ Attr AS (
 		AND d.LangCode = 'TR'
 	WHERE a.ItemTypeCode = @p1
 	  AND ISNULL(a.IsBlocked, 0) = 0
-),
+	  AND ISNULL(a.AttributeCode, '') <> ''
+)
 SELECT
-	a.ItemTypeCode,
-	a.AttributeTypeCode,
-	ISNULL(NULLIF(td.AttributeTypeDescription, ''), CAST(a.AttributeTypeCode AS NVARCHAR(30))) AS AttributeTypeDescription,
+	rt.ItemTypeCode,
+	rt.AttributeTypeCode,
+	rt.AttributeTypeDescription,
 	a.AttributeCode,
 	a.AttributeDescription
-FROM Attr a
-LEFT JOIN TypeDesc td
-	ON td.ItemTypeCode = a.ItemTypeCode
-	AND td.AttributeTypeCode = a.AttributeTypeCode
+FROM RequiredTypes AS rt
+LEFT JOIN Attr AS a
+	ON a.ItemTypeCode = rt.ItemTypeCode
+	AND a.AttributeTypeCode = rt.AttributeTypeCode
+WHERE ISNULL(a.AttributeCode, '') <> ''
 ORDER BY
-	a.AttributeTypeCode,
-	CASE WHEN a.AttributeCode = '-' THEN 0 ELSE 1 END,
+	rt.AttributeTypeCode,
+	CASE WHEN a.AttributeCode IN ('-', '.') THEN 0 ELSE 1 END,
 	a.AttributeCode;
 `